Merge pull request #76 from jwhite-usgs/hotfix_base_rei_tags

Hotfix base rei tags
usgs · Jul 6, 2020 · 8a6edd3 · 8a6edd3
2 parents 92f50e3 + 05cda99
commit 8a6edd3
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 28 deletions.
diff --git a/documentation/pestpp4.3.17.docx b/documentation/pestpp4.3.17.docx
diff --git a/documentation/pestpp4.3.18.docx b/documentation/pestpp4.3.18.docx
diff --git a/scripts/build_pestpp_win.bat b/scripts/build_pestpp_win.bat
@@ -3,6 +3,7 @@
 set first_path=%cd%
 cd "%~dp0\.."
 
+rem fast but without fortran
 rmdir /Q /S bin
 rmdir /Q /S build
 mkdir build

diff --git a/scripts/build_pestpp_win_no_ifort.bat b/scripts/build_pestpp_win_no_ifort.bat
@@ -0,0 +1,28 @@
+@echo off
+
+set first_path=%cd%
+cd "%~dp0\.."
+
+rem fast but without fortran
+rmdir /Q /S bin
+rmdir /Q /S build
+mkdir build
+call "C:\Program Files (x86)\IntelSWTools\compilers_and_libraries\windows\bin\compilervars.bat" intel64
+cd build
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=icl ..
+ninja
+cpack -G ZIP
+copy /y *.zip ..\
+
+cd ..
+call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" x64
+rmdir /Q /S build
+mkdir build
+cd build
+cmake -GNinja -DCMAKE_BUILD_TYPE=Release ..
+ninja
+cpack -G ZIP
+copy /y *.zip ..\
+
+cd %first_path%
+pause
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 "4.3.17";
+#define PESTPP_VERSION "4.3.18";
 
 #if defined(_WIN32) || defined(_WIN64)
 #define OS_WIN

diff --git a/src/libs/opt/sequential_lp.cpp b/src/libs/opt/sequential_lp.cpp
@@ -972,7 +972,7 @@ void sequentialLP::iter_presolve()
 				missing.push_back(name);
 		if (missing.size() > 0)
 			throw_sequentialLP_error("the following decision vars were not found in the jacobian " + basejac_filename + " : ", missing);
-		if (constraints.get_use_fosm())
+		if ((constraints.get_use_chance()) && (constraints.get_use_fosm()))
 		{
 			for (auto& name : constraints.get_adj_par_names())
 				//if (find(start, end, name) == end)

diff --git a/src/libs/pestpp_common/EnsembleMethodUtils.cpp b/src/libs/pestpp_common/EnsembleMethodUtils.cpp
@@ -969,7 +969,7 @@ void save_base_real_par_rei(Pest& pest_scenario, ParameterEnsemble& pe, Observat
 			if (iter >= 0)
 				ss << iter << ".";
 			ss << "base.rei";
-			output_file_writer.write_rei(file_manager.open_ofile_ext(ss.str()), 0,
+			output_file_writer.write_rei(file_manager.open_ofile_ext(ss.str()), iter,
 				pest_scenario.get_ctl_observations(), obs, obj_func, pars);
 		}
 	}

diff --git a/src/libs/pestpp_common/Jacobian.cpp b/src/libs/pestpp_common/Jacobian.cpp
@@ -276,7 +276,7 @@ bool Jacobian::build_runs(Parameters &ctl_pars, Observations &ctl_obs, vector<st
 		{
 			debug_msg("fail");
 			//cout << endl << " warning: failed to compute parameter deriviative for " << ipar_name << endl;
-			file_manager.rec_ofstream() << " warning: failed to compute parameter deriviative for " << ipar_name << endl;
+			file_manager.rec_ofstream() << " warning: failed to compute parameter derivative for " << ipar_name << endl;
 			failed_parameter_names.insert(ipar_name);
 		}
 	}

diff --git a/src/libs/pestpp_common/Jacobian_1to1.cpp b/src/libs/pestpp_common/Jacobian_1to1.cpp
@@ -111,8 +111,8 @@ bool Jacobian_1to1::build_runs(Parameters &ctl_pars, Observations &ctl_obs, vect
 		}
 		else
 		{
-			cout << endl << " warning: failed to compute parameter deriviative for " << i_name << endl;
-			file_manager.rec_ofstream() << " warning: failed to compute parameter deriviative for " << i_name << endl;
+			cout << endl << " warning: failed to compute parameter derivative for " << i_name << endl;
+			file_manager.rec_ofstream() << " warning: failed to compute parameter derivative for " << i_name << endl;
 			failed_parameter_names.insert(i_name);
 			failed_to_increment_parmaeters.insert(i_name, derivative_par_value);
 		}
@@ -192,8 +192,8 @@ bool Jacobian_1to1::build_runs(ModelRun &init_model_run, vector<string> numeric_
 		}
 		else
 		{
-			cout << endl << " warning: failed to compute parameter deriviative for " << i_name << endl;
-			file_manager.rec_ofstream() << " warning: failed to compute parameter deriviative for " << i_name << endl;
+			cout << endl << " warning: failed to compute parameter derivative for " << i_name << endl;
+			file_manager.rec_ofstream() << " warning: failed to compute parameter derivative for " << i_name << endl;
 			failed_parameter_names.insert(i_name);
 			failed_to_increment_parmaeters.insert(i_name, derivative_par_value);
 		}