Merge pull request #147 from jtwhite79/develop

Develop
usgs · Nov 23, 2021 · 5acc7cf · 5acc7cf
2 parents 4d6380a + 3508444
commit 5acc7cf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -37,6 +37,7 @@ jobs:
           - { test_dir: "pestpp-mou_benchmarks", test_repo: "https://github.com/pestpp/pestpp-mou_benchmarks", test_script: "mou_tests_2.py"}
           - { test_dir: "pestpp-mou_benchmarks", test_repo: "https://github.com/pestpp/pestpp-mou_benchmarks", test_script: "henry_test.py"}
           - { test_dir: "pestpp-da_benchmarks", test_repo: "https://github.com/pestpp/pestpp-da_benchmarks", test_script: "da_tests.py"}
+          - { test_dir: "pestpp-da_benchmarks", test_repo: "https://github.com/pestpp/pestpp-da_benchmarks", test_script: "lorenz96_tests.py"}
           - { test_dir: "pestpp-sqp_benchmarks", test_repo: "https://github.com/pestpp/pestpp-sqp_benchmarks", test_script: "sqp_tests.py"}
     env: ${{ matrix.env }}
 

diff --git a/src/libs/common/config_os.h b/src/libs/common/config_os.h
@@ -2,7 +2,7 @@
 #define CONFIG_OS_H_
 
 
-#define PESTPP_VERSION "5.1.4";
+#define PESTPP_VERSION "5.1.5";
 
 #if defined(_WIN32) || defined(_WIN64)
 #define OS_WIN

diff --git a/src/libs/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp
@@ -2639,7 +2639,7 @@ void ParChangeSummarizer::write_to_csv(string& filename)
 }
 
 
-void ParChangeSummarizer::update(ParameterEnsemble& pe)
+void ParChangeSummarizer:: update(ParameterEnsemble& pe)
 {
 	mean_change.clear();
 	std_change.clear();
@@ -2996,6 +2996,16 @@ void EnsembleMethod::sanity_checks()
     string restart_par = ppo->get_ies_par_restart_csv();
 
 
+	if (pest_scenario.get_control_info().noptmax > 10)
+	{
+		warnings.push_back("noptmax > 10, don't expect anything meaningful from the results!");
+	}
+
+	else if (pest_scenario.get_control_info().noptmax > 3)
+	{
+		warnings.push_back("noptmax > 3, this is a lot of iterations for an ensemble method, please consider using fewer iterations for better outcomes");
+	}
+
     if (pest_scenario.get_control_info().pestmode == ControlInfo::PestMode::REGUL)
     {
         warnings.push_back("'pestmode' == 'regularization', in pestpp-ies, this is controlled with the ++ies_reg_factor argument, resetting to 'estimation'");

diff --git a/src/libs/pestpp_common/Pest.cpp b/src/libs/pestpp_common/Pest.cpp
@@ -1539,8 +1539,8 @@ int Pest::process_ctl_file(ifstream& fin, string _pst_filename, ofstream& f_rec)
 			{
 				if (tokens.size() != 2)
 					throw_control_file_error(f_rec, "wrong number of tokens on '* model output' line '" + line + "' expecting 2");
-				model_exec_info.tplfile_vec.push_back(tokens_case_sen[0]);
-				model_exec_info.inpfile_vec.push_back(tokens_case_sen[1]);
+				model_exec_info.insfile_vec.push_back(tokens_case_sen[0]);
+				model_exec_info.outfile_vec.push_back(tokens_case_sen[1]);
 			}
 
 

diff --git a/src/programs/pest++/pest++.vcxproj.user b/src/programs/pest++/pest++.vcxproj.user
@@ -15,13 +15,13 @@
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArguments>test.pst</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>case.pst</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug2_dll|x64'">
     <LocalDebuggerCommandArguments>pest.pst /H :4005</LocalDebuggerCommandArguments>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerWorkingDirectory>C:\Dev\pestpp\benchmarks\tplins_test_1\test_missing_e</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>C:\Dev\pestpp</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerDebuggerType>Auto</LocalDebuggerDebuggerType>
     <LocalDebuggerAttach>false</LocalDebuggerAttach>