From 08e1e09af278f2a8491d5a1b50f3ecbfb45a0a34 Mon Sep 17 00:00:00 2001 From: Jack Rao Date: Wed, 6 Dec 2023 17:35:49 -0800 Subject: [PATCH] got rid of the return statement issue. Only committing rn so I can change the branch and start more systemmatically testing for what is making the convergence issue so shit. Stay tuned. --- Code/Source/cvOneDMaterialOlufsen.cxx | 3 +-- Code/Source/cvOneDSolverDefinitions.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Code/Source/cvOneDMaterialOlufsen.cxx b/Code/Source/cvOneDMaterialOlufsen.cxx index c3f8af0..cfb3a69 100644 --- a/Code/Source/cvOneDMaterialOlufsen.cxx +++ b/Code/Source/cvOneDMaterialOlufsen.cxx @@ -229,8 +229,7 @@ double cvOneDMaterialOlufsen::GetD2pDS2(double area, double z)const{ } double cvOneDMaterialOlufsen::GetOutflowFunction(double pressure, double z)const{ - // cout << "L_P: " << L_P << " pressure: " << pressure << " P_ambient: " << P_ambient << " total: " << L_P*(pressure - P_ambient) << endl; - return 1e-4 * (pressure - 0.0); + return 1e-4 * (pressure - 10000.0); } double cvOneDMaterialOlufsen::GetDOutflowDp(double pressure, double z)const{ diff --git a/Code/Source/cvOneDSolverDefinitions.h b/Code/Source/cvOneDSolverDefinitions.h index 867d2eb..9f3bc40 100644 --- a/Code/Source/cvOneDSolverDefinitions.h +++ b/Code/Source/cvOneDSolverDefinitions.h @@ -40,7 +40,7 @@ #define MAX_STRING_SIZE 20 #define EPSILON 1.0e-10 #define OUTPUT_PRECISION 12 -#define MAX_NONLINEAR_ITERATIONS 1000 +#define MAX_NONLINEAR_ITERATIONS 30 #define RELATIVE_TOLERANCE 1.0e-7 #define ABSOLUTE_TOLERANCE 5.0e-6