From 842703c1a377a18a17ed9cf3e5858723bc80b7ee Mon Sep 17 00:00:00 2001 From: jdub Date: Tue, 9 Nov 2021 11:44:44 -0700 Subject: [PATCH 1/3] added L96 --- .github/workflows/ci.yml | 1 + src/libs/pestpp_common/EnsembleMethodUtils.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 023ae1d4b..3c4876684 100644 --- 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/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp index 51ce956ac..b6edc189d 100644 --- 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(); From 893676e4ca1bac5a61c270ff72888cf908a0c3ed Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Nov 2021 09:38:51 -0700 Subject: [PATCH 2/3] bug fix in reading sep internal model output section --- src/libs/common/config_os.h | 2 +- src/libs/pestpp_common/Pest.cpp | 4 ++-- src/programs/pest++/pest++.vcxproj.user | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/libs/common/config_os.h b/src/libs/common/config_os.h index db24234ca..457aaa861 100644 --- 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/Pest.cpp b/src/libs/pestpp_common/Pest.cpp index 433e77dd5..7eec651d8 100644 --- 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 index 713b695d5..eac0ad9cf 100644 --- a/src/programs/pest++/pest++.vcxproj.user +++ b/src/programs/pest++/pest++.vcxproj.user @@ -15,13 +15,13 @@ WindowsLocalDebugger - test.pst + case.pst pest.pst /H :4005 - C:\Dev\pestpp\benchmarks\tplins_test_1\test_missing_e + C:\Dev\pestpp WindowsLocalDebugger Auto false From 228c391458863f16115a2266bcc9b3e6a8d1bc8b Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Nov 2021 14:30:54 -0700 Subject: [PATCH 3/3] added noptmax em warnings --- src/libs/pestpp_common/EnsembleMethodUtils.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/libs/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp index 51ce956ac..d711dfec5 100644 --- a/src/libs/pestpp_common/EnsembleMethodUtils.cpp +++ b/src/libs/pestpp_common/EnsembleMethodUtils.cpp @@ -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'");