Merge pull request #407 from jtwhite79/feat_regfac

Feat regfac

Author: jtwhite79

.github/workflows/ci-devenv.yml

@@ -21,7 +21,7 @@ jobs:
           - {os: macos-14, shell: bash}
           - {os: ubuntu-latest, shell: bash}
           - {os: ubuntu-22.04, shell: bash}
-          - {os: windows-latest, shell: bash}
+          - {os: windows-2022, shell: bash}
     defaults:
       run:
         shell: ${{ matrix.shell }}

CMakeLists.txt

@@ -1,6 +1,10 @@
 # This is the top-level CMake file for PEST++
 cmake_minimum_required(VERSION 3.15)
 
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+  add_compile_definitions(_DEBUG)
+endif()
+
 # Get PESTPP_VERSION from common source header
 file(READ "${CMAKE_SOURCE_DIR}/src/libs/common/config_os.h" _file)
 string(REGEX MATCH "PESTPP_VERSION \"([0-9\.]+)\"" _ ${_file})
@@ -63,6 +67,7 @@ message(STATUS "CMAKE_THREAD_LIBS_INIT=${CMAKE_THREAD_LIBS_INIT}")
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_TRY_COMPILE_TARGET_TYPE)
 
 add_compile_definitions(_HAS_STD_BYTE=0)
 

benchmarks/basic_tests.py

@@ -2124,6 +2124,7 @@ def parse_pst_test():
     pyemu.os_utils.run("{0} control.pst".format(exe_path),cwd=t_d)
 
 
+
 if __name__ == "__main__":
     #parse_pst_test()
     #basic_test()

benchmarks/glm_test_base.py

@@ -945,16 +945,16 @@ def tenpar_xsec_stress_test_5super():
     #tenpar_superpar_restart_test()
     #freyberg_basic_restart_test()
     # jac_diff_invest()
-    #new_fmt_load_test()
+    new_fmt_load_test()
     #tenpar_hotstart_test()
     #tenpar_normalform_test()
     #freyberg_stress_test()
     #shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-glm.exe"),os.path.join("..","bin","win","pestpp-glm.exe"))
     #tenpar_xsec_stress_test_2()
     #tenpar_xsec_stress_test_3()
-    tenpar_xsec_stress_test_5super()
+    #tenpar_xsec_stress_test_5super()
 
-    tenpar_xsec_stress_test_5()
+    #tenpar_xsec_stress_test_5()