Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Develop #147

Merged
merged 4 commits into from
Nov 23, 2021
Merged

Develop #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
842703c
added L96
Nov 9, 2021
893676e
bug fix in reading sep internal model output section
jtwhite79 Nov 22, 2021
228c391
added noptmax em warnings
jtwhite79 Nov 22, 2021
3508444
Merge remote-tracking branch 'origin/feat_new_da_tests' into develop
Nov 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion src/libs/common/config_os.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion src/libs/pestpp_common/EnsembleMethodUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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'");
Expand Down
4 changes: 2 additions & 2 deletions src/libs/pestpp_common/Pest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
}


Expand Down
4 changes: 2 additions & 2 deletions src/programs/pest++/pest++.vcxproj.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down