From 914a59333851dff87f9a2c7b92f797e085be7c51 Mon Sep 17 00:00:00 2001 From: "ellen.seabrooke" <seabrooke@ifb.uni-stuttgart.de> Date: Mon, 10 Mar 2025 15:45:33 +0100 Subject: [PATCH] Fix fuel factors and adapt convergence criteria for m0 calculation --- initial_sizing/src/taw/analytical/TawAnalytical.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/initial_sizing/src/taw/analytical/TawAnalytical.cpp b/initial_sizing/src/taw/analytical/TawAnalytical.cpp index 89ea517b..12f2a31e 100644 --- a/initial_sizing/src/taw/analytical/TawAnalytical.cpp +++ b/initial_sizing/src/taw/analytical/TawAnalytical.cpp @@ -228,9 +228,8 @@ void TawAnalytical::calculateFuelFraction() { void TawAnalytical::calculateMassEstimation() { // Constants mo_iteration = 5.5 * Payload; - c_kerosine = 0.55; - c_LH2 = 0.44; - mo_iteration = mo_initial; + c_kerosine = 0.44; + c_LH2 = 0.55; // Select the appropriate coefficient based on the fuel type c_fuel = (energyCarrier == "kerosene") ? c_kerosine : c_LH2; @@ -264,7 +263,7 @@ void TawAnalytical::calculateMassEstimation() { bool TawAnalytical::checkConvergence(double mo_iteration, double mo_iteration_previous) { // Convergence check here - double convergence_criteria = 0.0005; // 0.05% + double convergence_criteria = 0.005; // 0.5% return std::abs(mo_iteration - mo_iteration_previous) < convergence_criteria; } -- GitLab