diff --git a/utils/laugh_tests/celia1990/verify_celia.py b/utils/laugh_tests/celia1990/verify_celia.py
index e319c807c1e805bc4d7e9a825d6dab629468a0de..227b7a1f1f0a9e6fa120efe14cc04e4824b13856 100644
--- a/utils/laugh_tests/celia1990/verify_celia.py
+++ b/utils/laugh_tests/celia1990/verify_celia.py
@@ -102,11 +102,7 @@ for iHRU in range(0, numHRU):
print(" verified_hru = ", verified_data[elem])
print(" hru_to_compare = ", to_verify_data[elem])
break
-
- # if (verified_hru[var].values != hru_to_compare[var].values).all():
- # print("ERROR: Output data is not the same in",var)
- # print(" verified_hru = ", verified_hru[var].values)
- # print(" hru_to_compare = ", hru_to_compare[var].values)
+
except TypeError:
print("variable - ", var, "Cannot be compared with len")
print(" verified_hru = ",verified_hru[var].values)
diff --git a/utils/laugh_tests/colbeck1976/config/Summa_Actors_Settings.json b/utils/laugh_tests/colbeck1976/config/exp1/Summa_Actors_Settings.json
similarity index 63%
rename from utils/laugh_tests/colbeck1976/config/Summa_Actors_Settings.json
rename to utils/laugh_tests/colbeck1976/config/exp1/Summa_Actors_Settings.json
index cf3703231c75b9a338b56ba7dbd8155165fa98e3..4471c5d259c64404a349f32844b54fcd779504df 100644
--- a/utils/laugh_tests/colbeck1976/config/Summa_Actors_Settings.json
+++ b/utils/laugh_tests/colbeck1976/config/exp1/Summa_Actors_Settings.json
@@ -1,6 +1,6 @@
{
"DistributedSettings": {
- "distributed-mode": true,
+ "distributed-mode": false,
"host": "localhost",
"port": 4444
},
@@ -20,13 +20,13 @@
},
"JobActor": {
- "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
+ "FileManagerPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp1.txt",
"outputCSV": false,
- "csvPath": "/scratch/kck540/csv/"
+ "csvPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/output/"
},
"HRUActor": {
"printOutput": true,
- "outputFrequency": 500
+ "outputFrequency": 1
}
}
diff --git a/utils/laugh_tests/colbeck1976/config/exp2/Summa_Actors_Settings.json b/utils/laugh_tests/colbeck1976/config/exp2/Summa_Actors_Settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..c463fa224e7fbe6e12b5e007df55857c3c601765
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/config/exp2/Summa_Actors_Settings.json
@@ -0,0 +1,32 @@
+{
+ "DistributedSettings": {
+ "distributed-mode": false,
+ "host": "localhost",
+ "port": 4444
+ },
+
+ "SimulationSettings": {
+ "total_hru_count": 100000,
+ "num_hru_per_batch": 500
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 250,
+ "maxGRUPerJob": 250
+ },
+
+ "FileAccessActor": {
+ "num_vectors_in_output_manager": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp2.txt",
+ "outputCSV": false,
+ "csvPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/output/"
+ },
+
+ "HRUActor": {
+ "printOutput": true,
+ "outputFrequency": 1
+ }
+}
diff --git a/utils/laugh_tests/colbeck1976/config/exp3/Summa_Actors_Settings.json b/utils/laugh_tests/colbeck1976/config/exp3/Summa_Actors_Settings.json
new file mode 100644
index 0000000000000000000000000000000000000000..c18a9282d9c2368603b94073b26dd4a4d6463897
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/config/exp3/Summa_Actors_Settings.json
@@ -0,0 +1,32 @@
+{
+ "DistributedSettings": {
+ "distributed-mode": false,
+ "host": "localhost",
+ "port": 4444
+ },
+
+ "SimulationSettings": {
+ "total_hru_count": 100000,
+ "num_hru_per_batch": 500
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 250,
+ "maxGRUPerJob": 250
+ },
+
+ "FileAccessActor": {
+ "num_vectors_in_output_manager": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp3.txt",
+ "outputCSV": false,
+ "csvPath": "/Summa-Actors/utils/laugh_tests/colbeck1976/output/"
+ },
+
+ "HRUActor": {
+ "printOutput": true,
+ "outputFrequency": 1
+ }
+}
diff --git a/utils/laugh_tests/colbeck1976/output/colbeck1976-exp1GRU1-1_timestep.nc b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp1GRU1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..5c4b9adb2d00c716208b87546a6e3806fe85208f
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp1GRU1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/output/colbeck1976-exp2GRU1-1_timestep.nc b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp2GRU1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..ce00720f1b5a90c8340bd4de76367f035f977b60
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp2GRU1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/output/colbeck1976-exp3GRU1-1_timestep.nc b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp3GRU1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..cee21d14a88c0a1c36adf2d91b369fcf84eea934
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/output/colbeck1976-exp3GRU1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/output/runinfo.txt b/utils/laugh_tests/colbeck1976/output/runinfo.txt
new file mode 100644
index 0000000000000000000000000000000000000000..df17fe35ae4f6704e4a41a3a097c2cc85a370e85
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/output/runinfo.txt
@@ -0,0 +1 @@
+ Run start time on system: ccyy=2022 - mm=08 - dd=15 - hh=21 - mi=52 - ss=43.015
diff --git a/utils/laugh_tests/colbeck1976/run_test.sh b/utils/laugh_tests/colbeck1976/run_test.sh
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/utils/laugh_tests/colbeck1976/run_test_summa.sh b/utils/laugh_tests/colbeck1976/run_test_summa.sh
new file mode 100755
index 0000000000000000000000000000000000000000..f4ed0cce1905d174b2e7642ff4a20f24c8d04444
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/run_test_summa.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp1.txt
+/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt
+/SUMMA/bin/summa.exe -g 1 1 -m /Summa-Actors/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt
\ No newline at end of file
diff --git a/utils/laugh_tests/colbeck1976/run_test_summa_actors.sh b/utils/laugh_tests/colbeck1976/run_test_summa_actors.sh
new file mode 100755
index 0000000000000000000000000000000000000000..27be92c0c34b633daae21832d34cf17d39bf416b
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/run_test_summa_actors.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/colbeck1976/config/exp1
+/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/colbeck1976/config/exp2
+/Summa-Actors/bin/summaMain -g 1 -n 1 -c /Summa-Actors/utils/laugh_tests/colbeck1976/config/exp3
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_defineModelOutput.txt b/utils/laugh_tests/colbeck1976/settings/summa_defineModelOutput.txt
new file mode 100644
index 0000000000000000000000000000000000000000..bfca6f739507af8bb97caa0bd26997d2c42758e8
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_defineModelOutput.txt
@@ -0,0 +1,11 @@
+! ---------
+! model variables
+! ---------
+scalarRainfall | 1
+scalarSnowfall | 1
+scalarRainPlusMelt | 1
+mLayerVolFracLiq | 1
+mLayerVolFracIce | 1
+iLayerNrgFlux | 1
+iLayerHeight | 1
+mLayerDepth | 1
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp1.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..cc2ee6efbcf874861630fb567cb1adc13977ddeb
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp1.txt
@@ -0,0 +1,23 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' !
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/output/' ! OUTPUT_PATH
+forcingFreq 'month' ! the frequeny of forcing files (month, year)
+forcingStart '1990-01-01'
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp1.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp1.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp1' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp1.txt
\ No newline at end of file
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp2.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ede30b91a02e43f1acfad1f741e3b71686fc7321
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp2.txt
@@ -0,0 +1,23 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' ! Time zone info
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/output/' ! OUTPUT_PATH
+forcingFreq 'month' ! the frequeny of forcing files (month, year)
+forcingStart '1990-01-01'
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp2.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp2.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp2' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp2.txt
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp3.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..5edc0ba40d167ef0d9a16e9678a859636f5f23fe
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_colbeck1976-exp3.txt
@@ -0,0 +1,23 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' ! Time zone info
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/output/' ! OUTPUT_PATH
+forcingFreq 'month' ! the frequeny of forcing files (month, year)
+forcingStart '1990-01-01'
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp3.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp3.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp3' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp3.txt
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt
new file mode 100644
index 0000000000000000000000000000000000000000..c649253189665863086c5918ac3eefdecd601cd3
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp2.txt
@@ -0,0 +1,21 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' ! Time zone info
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/verification_data/' ! OUTPUT_PATH
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp2.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp2.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp2' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp2.txt
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f3fa77602274bdd44da3e7aab80e7e78ae219ccd
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1976-exp3.txt
@@ -0,0 +1,21 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' ! Time zone info
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/verification_data/' ! OUTPUT_PATH
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp3.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp3.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp3' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp3.txt
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1979-exp1.txt b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1979-exp1.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f0621c14aca3d7d6616d8173af398aec3a182348
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_fileManager_verify_colbeck1979-exp1.txt
@@ -0,0 +1,21 @@
+controlVersion 'SUMMA_FILE_MANAGER_V3.0.0' !
+simStartTime '1990-01-01 00:01' !
+simEndTime '1990-01-01 10:00' !
+tmZoneInfo 'localTime' !
+settingsPath '/Summa-Actors/utils/laugh_tests/colbeck1976/settings/' ! SETNGS_PATH
+forcingPath '/Summa-Actors/utils/laugh_tests/colbeck1976/forcing_data/' ! INPUT_PATH
+outputPath '/Summa-Actors/utils/laugh_tests/colbeck1976/verification_data/' ! OUTPUT_PATH
+decisionsFile 'summa_zDecisions_colbeck1976.txt' ! M_DECISIONS = definition of model decisions
+outputControlFile 'summa_defineModelOutput.txt' ! OUTPUT_CONTROL
+globalHruParamFile 'summa_zLocalParamInfo.txt' ! LOCALPARAM_INFO = default values and constraints for local model parameters
+globalGruParamFile 'summa_zBasinParamInfo.txt' ! BASINPARAM_INFO = default values and constraints for basin-average parameters
+attributeFile 'summa_zLocalAttributes.nc' ! LOCAL_ATTRIBUTES = local attributes
+trialParamFile 'summa_zParamTrial_colbeck1976-exp1.nc' ! PARAMETER_TRIAL = trial values for model parameters
+forcingListFile 'summa_zForcingFileList.txt' ! FORCING_FILELIST = list of files used in each HRU
+initConditionFile 'summa_zInitialCond_colbeck1976-exp1.nc' ! MODEL_INITCOND = model initial conditions
+outFilePrefix 'colbeck1976-exp1' ! OUTPUT_PREFIX = prefix for the output file
+vegTableFile 'VEGPARM.TBL' !
+soilTableFile 'SOILPARM.TBL' !
+generalTableFile 'GENPARM.TBL' !
+noahmpTableFile 'MPTABLE.TBL' !
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp1.txt
\ No newline at end of file
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zBasinParamInfo.txt b/utils/laugh_tests/colbeck1976/settings/summa_zBasinParamInfo.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1926fd71fbc6ce90cd4180f652ae414885e4b611
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_zBasinParamInfo.txt
@@ -0,0 +1,35 @@
+! ***********************************************************************************************************************
+! ***********************************************************************************************************************
+! ***** DEFINITION OF BASIN PARAMETERS **********************************************************************************
+! ***********************************************************************************************************************
+! ***********************************************************************************************************************
+! Note: lines starting with "!" are treated as comment lines -- there is no limit on the number of comment lines.
+!
+! ***********************************************************************************************************************
+! DEFINE BASIN MODEL PARAMETERS
+! ------------------------------------
+! the format definition defines the format of the file, which can be changed
+! the delimiters "| " must be present (format a1), as these are used to check the integrety of the file
+! columns are:
+! 1: parameter name
+! 2: default parameter value
+! 3: lower parameter limit
+! 4: upper parameter limit
+! ***********************************************************************************************************************
+!
+! ********************************************************************
+! define format string for parameter descriptions
+! ********************************************************************
+'(a25,1x,a1,1x,3(f12.4,1x,a1,1x))' ! format string for parameter descriptions (must be in single quotes)
+! ********************************************************************
+! baseflow
+! ********************************************************************
+basin__aquiferHydCond | 0.0100 | 0.0001 | 10.0000
+basin__aquiferScaleFactor | 3.5000 | 0.1000 | 100.0000
+basin__aquiferBaseflowExp | 5.0000 | 1.0000 | 10.0000
+! ********************************************************************
+! within-grid routing
+! ********************************************************************
+routingGammaShape | 2.5000 | 2.0000 | 3.0000
+routingGammaScale | 20000.0000 | 1.0000 | 5000000.0000
+! ********************************************************************
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt b/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt
new file mode 100644
index 0000000000000000000000000000000000000000..f5ac1fa2017c484c54809ff8a92f921a4af24451
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_zDecisions_colbeck1976.txt
@@ -0,0 +1,170 @@
+! ***********************************************************************************************************************
+! DEFINITION OF THE MODEL DECISIONS
+! ***********************************************************************************************************************
+! This file defines the modeling decisions used.
+! NOTES:
+! (1) lines starting with ! are treated as comment lines -- there is no limit on the number of comment lines
+! (2) the name of the decision is followed by the character string defining the decision
+! (3) the simulation start/end times must be within single quotes
+! ***********************************************************************************************************************
+! ***********************************************************************************************************************
+soilCatTbl ROSETTA ! (03) soil-category dateset
+vegeParTbl USGS ! (04) vegetation category dataset
+soilStress NoahType ! (05) choice of function for the soil moisture control on stomatal resistance
+stomResist BallBerry ! (06) choice of function for stomatal resistance
+! ***********************************************************************************************************************
+num_method itertive ! (07) choice of numerical method
+fDerivMeth analytic ! (08) method used to calculate flux derivatives
+LAI_method monTable ! (09) method used to determine LAI and SAI
+f_Richards mixdform ! (10) form of Richard's equation
+groundwatr noXplict ! (11) choice of groundwater parameterization
+hc_profile constant ! (12) choice of hydraulic conductivity profile
+bcUpprTdyn zeroFlux ! (13) type of upper boundary condition for thermodynamics
+bcLowrTdyn zeroFlux ! (14) type of lower boundary condition for thermodynamics
+bcUpprSoiH liq_flux ! (15) type of upper boundary condition for soil hydrology
+bcLowrSoiH drainage ! (16) type of lower boundary condition for soil hydrology
+veg_traits CM_QJRMS1988 ! (17) choice of parameterization for vegetation roughness length and displacement height
+canopyEmis difTrans ! (18) choice of parameterization for canopy emissivity
+snowIncept lightSnow ! (19) choice of parameterization for snow interception
+windPrfile logBelowCanopy ! (20) choice of wind profile through the canopy
+astability louisinv ! (21) choice of stability function
+canopySrad CLM_2stream ! (22) choice of canopy shortwave radiation method
+alb_method varDecay ! (23) choice of albedo representation
+compaction anderson ! (24) choice of compaction routine
+snowLayers jrdn1991 ! (25) choice of method to combine and sub-divide snow layers
+thCondSnow smnv2000 ! (26) choice of thermal conductivity representation for snow
+thCondSoil mixConstit ! (27) choice of thermal conductivity representation for soil
+spatial_gw localColumn ! (28) choice of method for the spatial representation of groundwater
+subRouting timeDlay ! (29) choice of method for sub-grid routing
+! ***********************************************************************************************
+! ***** description of the options available -- nothing below this point is read ****************
+! ***********************************************************************************************
+! -----------------------------------------------------------------------------------------------
+! (01) simulation start time
+! (02) simulation end time
+! -----------------------------------------------------------------------------------------------
+! (03) soil-category dateset
+! STAS ! STATSGO dataset
+! STAS-RUC ! ??
+! ROSETTA ! merged Rosetta table with STAS-RUC
+! -----------------------------------------------------------------------------------------------
+! (04) vegetation category dataset
+! USGS ! USGS 24/27 category dataset
+! MODIFIED_IGBP_MODIS_NOAH ! MODIS 20-category dataset
+! -----------------------------------------------------------------------------------------------
+! (05) choice of function for the soil moisture control on stomatal resistance
+! NoahType ! thresholded linear function of volumetric liquid water content
+! CLM_Type ! thresholded linear function of matric head
+! SiB_Type ! exponential of the log of matric head
+! -----------------------------------------------------------------------------------------------
+! (06) choice of function for stomatal resistance
+! BallBerry ! Ball-Berry
+! Jarvis ! Jarvis
+! -----------------------------------------------------------------------------------------------
+! (07) choice of numerical method
+! itertive ! iterative
+! non_iter ! non-iterative
+! itersurf ! iterate only on the surface energy balance
+! -----------------------------------------------------------------------------------------------
+! (08) method used to calculate flux derivatives
+! numericl ! numerical derivatives
+! analytic ! analytical derivatives
+! -----------------------------------------------------------------------------------------------
+! (09) method used to determine LAI and SAI
+! monTable ! LAI/SAI taken directly from a monthly table for different vegetation classes
+! specified ! LAI/SAI computed from green vegetation fraction and winterSAI and summerLAI parameters
+! -----------------------------------------------------------------------------------------------
+! (10) form of Richards' equation
+! moisture ! moisture-based form of Richards' equation
+! mixdform ! mixed form of Richards' equation
+! -----------------------------------------------------------------------------------------------
+! (11) choice of groundwater parameterization
+! qTopmodl ! topmodel parameterization
+! bigBuckt ! a big bucket (lumped aquifer model)
+! noXplict ! no explicit groundwater parameterization
+! -----------------------------------------------------------------------------------------------
+! (12) choice of hydraulic conductivity profile
+! constant ! constant hydraulic conductivity with depth
+! pow_prof ! power-law profile
+! -----------------------------------------------------------------------------------------------
+! (13) choice of upper boundary conditions for thermodynamics
+! presTemp ! prescribed temperature
+! nrg_flux ! energy flux
+! -----------------------------------------------------------------------------------------------
+! (14) choice of lower boundary conditions for thermodynamics
+! presTemp ! prescribed temperature
+! zeroFlux ! zero flux
+! -----------------------------------------------------------------------------------------------
+! (15) choice of upper boundary conditions for soil hydrology
+! presHead ! prescribed head (volumetric liquid water content for mixed form of Richards' eqn)
+! liq_flux ! liquid water flux
+! -----------------------------------------------------------------------------------------------
+! (16) choice of lower boundary conditions for soil hydrology
+! drainage ! free draining
+! presHead ! prescribed head (volumetric liquid water content for mixed form of Richards' eqn)
+! bottmPsi ! function of matric head in the lower-most layer
+! zeroFlux ! zero flux
+! -----------------------------------------------------------------------------------------------
+! (17) choice of parameterization for vegetation roughness length and displacement height
+! Raupach_BLM1994 ! Raupach (BLM 1994) "Simplified expressions..."
+! CM_QJRMS1988 ! Choudhury and Monteith (QJRMS 1998) "A four layer model for the heat budget..."
+! vegTypeTable ! constant parameters dependent on the vegetation type
+! -----------------------------------------------------------------------------------------------
+! (18) choice of parameterization for canopy emissivity
+! simplExp ! simple exponential function
+! difTrans ! parameterized as a function of diffuse transmissivity
+! -----------------------------------------------------------------------------------------------
+! (19) choice of parameterization for snow interception
+! stickySnow ! maximum interception capacity an increasing function of temerature
+! lightSnow ! maximum interception capacity an inverse function of new snow density
+! -----------------------------------------------------------------------------------------------
+! (20) choice of wind profile
+! exponential ! exponential wind profile extends to the surface
+! logBelowCanopy ! logarithmic profile below the vegetation canopy
+! -----------------------------------------------------------------------------------------------
+! (21) choice of stability function
+! standard ! standard MO similarity, a la Anderson (1979)
+! louisinv ! Louis (1979) inverse power function
+! mahrtexp ! Mahrt (1987) exponential function
+! -----------------------------------------------------------------------------------------------
+! (22) choice of canopy shortwave radiation method
+! noah_mp ! full Noah-MP implementation (including albedo)
+! CLM_2stream ! CLM 2-stream model (see CLM documentation)
+! UEB_2stream ! UEB 2-stream model (Mahat and Tarboton, WRR 2011)
+! NL_scatter ! Simplified method Nijssen and Lettenmaier (JGR 1999)
+! BeersLaw ! Beer's Law (as implemented in VIC)
+! -----------------------------------------------------------------------------------------------
+! (23) choice of albedo representation
+! conDecay ! constant decay rate (e.g., VIC, CLASS)
+! varDecay ! variable decay rate (e.g., BATS approach, with destructive metamorphism + soot content)
+! -----------------------------------------------------------------------------------------------
+! (24) choice of compaction routine
+! consettl ! constant settlement rate
+! anderson ! semi-empirical method of Anderson (1976)
+! -----------------------------------------------------------------------------------------------
+! (25) choice of method to combine and sub-divide snow layers
+! CLM_2010 ! CLM option: combination/sub-dividion rules depend on layer index
+! jrdn1991 ! SNTHERM option: same combination/sub-dividion rules applied to all layers
+! -----------------------------------------------------------------------------------------------
+! (26) choice of thermal conductivity representation for snow
+! tyen1965 ! Yen (1965)
+! melr1977 ! Mellor (1977)
+! jrdn1991 ! Jordan (1991)
+! smnv2000 ! Smirnova et al. (2000)
+! -----------------------------------------------------------------------------------------------
+! (27) choice of thermal conductivity representation for soil
+! funcSoilWet ! function of soil wetness
+! mixConstit ! mixture of constituents
+! hanssonVZJ ! test case for the mizoguchi lab experiment, Hansson et al. VZJ 2004
+! -----------------------------------------------------------------------------------------------
+! (28) choice of method for the spatial representation of groundwater
+! localColumn ! separate groundwater representation in each local soil column
+! singleBasin ! single groundwater store over the entire basin
+! -----------------------------------------------------------------------------------------------
+! (29) choice of method for sub-grid routing
+! timeDlay ! time-delay histogram
+! qInstant ! instantaneous routing
+! ***********************************************************************************************
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp1.txt
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp2.txt
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp3.txt
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zForcingFileList.txt b/utils/laugh_tests/colbeck1976/settings/summa_zForcingFileList.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8a3f73ef9c62fd5227b1f204b25f215fd903aded
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_zForcingFileList.txt
@@ -0,0 +1,8 @@
+! ****************************************************************************************************
+! List of forcing data files used
+!
+! This file includes one "word" per line:
+! (1) The name of a forcing file
+! --> filename must be in single quotes
+! ****************************************************************************************************
+ 'colbeck1976_forcing.nc'
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zForcingInfo_colbeck1976.txt b/utils/laugh_tests/colbeck1976/settings/summa_zForcingInfo_colbeck1976.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8b6d3f15142165983cc8aa9c2a36608f9ebb77c8
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_zForcingInfo_colbeck1976.txt
@@ -0,0 +1,29 @@
+! ***********************************************************************************************************************
+! DEFINITION OF THE FORCING FILE
+! ***********************************************************************************************************************
+! This file defines the name of the forcing data file, the number of columns in the file, the column index for each data
+! variable, the start index of the simulation period, the length of the simulation period,
+! and the length of the data time step
+! ***********************************************************************************************************************
+! NOTES:
+! (1) lines starting with "!" are treated as comment lines -- there is no limit on the number of comment lines
+! (2) the format definition defines the format of the file, which can be changed
+! (3) the format definition must be the first non-comment line
+! (4) the delimiters "|" must be present (format a1), as these are used to check the integrety of the file
+! ***********************************************************************************************************************
+'(a15,a1,1x,a)'
+filenmData | colbeck1976_forcing.txt ! name of the forcing data file (must be in single quotes)
+ncols | 13 ! number of columns in the forcing file
+iyyy | 1 ! year
+im | 2 ! month
+id | 3 ! day
+ih | 4 ! hour
+imin | 5 ! minute
+pptrate | 7 ! precipitation rate (kg m-2 s-1)
+SWRadAtm | 8 ! downwelling shortwave radiaiton (W m-2)
+LWRadAtm | 9 ! downwelling longwave radiation (W m-2)
+airtemp | 10 ! air temperature (K)
+windspd | 11 ! windspeed (m/s)
+airpres | 12 ! pressure (Pa)
+spechum | 13 ! specific humidity (g/g)
+data_step | 60 ! length of time step (seconds)
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp1.nc b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp1.nc
new file mode 100644
index 0000000000000000000000000000000000000000..6328ec1c30d23d1b13a6e01c207a86dc273940dc
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp1.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp2.nc b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp2.nc
new file mode 100644
index 0000000000000000000000000000000000000000..9859d7f3847bd47a442074287cac74e3796fd4fd
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp2.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp3.nc b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp3.nc
new file mode 100644
index 0000000000000000000000000000000000000000..9859d7f3847bd47a442074287cac74e3796fd4fd
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zInitialCond_colbeck1976-exp3.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zLocalAttributes.nc b/utils/laugh_tests/colbeck1976/settings/summa_zLocalAttributes.nc
new file mode 100644
index 0000000000000000000000000000000000000000..010c8d745e57d7a4b3ccba3834bc0869f23e9b81
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zLocalAttributes.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zLocalParamInfo.txt b/utils/laugh_tests/colbeck1976/settings/summa_zLocalParamInfo.txt
new file mode 100644
index 0000000000000000000000000000000000000000..a9972fc424d7061cc81eb546548c06f009289d95
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/settings/summa_zLocalParamInfo.txt
@@ -0,0 +1,226 @@
+! =======================================================================================================================
+! =======================================================================================================================
+! ===== DEFINITION OF MODEL PARAMETERS ==================================================================================
+! =======================================================================================================================
+! =======================================================================================================================
+! Note: lines starting with "!" are treated as comment lines -- there is no limit on the number of comment lines.
+!
+! =======================================================================================================================
+! DEFINE SITE MODEL PARAMETERS
+! ------------------------------------
+! the format definition defines the format of the file, which can be changed
+! the delimiters "| " must be present (format a2), as these are used to check the integrety of the file
+! columns are:
+! 1: parameter name
+! 2: default parameter value
+! 3: lower parameter limit
+! 4: upper parameter limit
+! =======================================================================================================================
+!
+! ====================================================================
+! define format string for parameter descriptions
+! ====================================================================
+'(a25,1x,3(a1,1x,f12.4,1x))' ! format string (must be in single quotes)
+! ====================================================================
+! boundary conditions
+! ====================================================================
+upperBoundHead | -0.7500 | -100.0000 | -0.0100
+lowerBoundHead | -10.0000 | -100.0000 | -0.0100
+upperBoundTheta | 0.2004 | 0.1020 | 0.3680
+lowerBoundTheta | 0.1100 | 0.1020 | 0.3680
+upperBoundTemp | 272.1600 | 270.1600 | 280.1600
+lowerBoundTemp | 274.1600 | 270.1600 | 280.1600
+! ====================================================================
+! precipitation partitioning
+! ====================================================================
+tempCritRain | 273.1600 | 272.1600 | 274.1600
+tempRangeTimestep | 2.0000 | 0.5000 | 5.0000
+frozenPrecipMultip | 1.0000 | 0.5000 | 1.5000
+! ====================================================================
+! snow properties
+! ====================================================================
+snowfrz_scale | 50.0000 | 10.0000 | 1000.0000
+fixedThermalCond_snow | 0.3500 | 0.1000 | 1.0000
+! ====================================================================
+! snow albedo
+! ====================================================================
+albedoMax | 0.8400 | 0.7000 | 0.9500
+albedoMinWinter | 0.5500 | 0.6000 | 1.0000
+albedoMinSpring | 0.5500 | 0.3000 | 1.0000
+albedoMaxVisible | 0.9500 | 0.7000 | 0.9500
+albedoMinVisible | 0.7500 | 0.5000 | 0.7500
+albedoMaxNearIR | 0.6500 | 0.5000 | 0.7500
+albedoMinNearIR | 0.3000 | 0.1500 | 0.4500
+albedoDecayRate | 1.0d+6 | 0.1d+6 | 5.0d+6
+albedoSootLoad | 0.3000 | 0.1000 | 0.5000
+albedoRefresh | 1.0000 | 1.0000 | 10.0000
+! ====================================================================
+! radiation transfer within snow
+! ====================================================================
+radExt_snow | 20.0000 | 20.0000 | 20.0000
+directScale | 0.0900 | 0.0000 | 0.5000
+Frad_direct | 0.7000 | 0.0000 | 1.0000
+Frad_vis | 0.5000 | 0.0000 | 1.0000
+! ====================================================================
+! new snow density
+! ====================================================================
+newSnowDenMin | 100.0000 | 50.0000 | 100.0000
+newSnowDenMult | 100.0000 | 25.0000 | 75.0000
+newSnowDenScal | 5.0000 | 1.0000 | 5.0000
+constSnowDen | 100.0000 | 50.0000 | 250.0000
+newSnowDenAdd | 109.0000 | 80.0000 | 120.0000
+newSnowDenMultTemp | 6.0000 | 1.0000 | 12.0000
+newSnowDenMultWind | 26.0000 | 16.0000 | 36.0000
+newSnowDenMultAnd | 1.0000 | 1.0000 | 3.0000
+newSnowDenBase | 0.0000 | 0.0000 | 0.0000
+! ====================================================================
+! snow compaction
+! ====================================================================
+densScalGrowth | 0.0460 | 0.0230 | 0.0920
+tempScalGrowth | 0.0400 | 0.0200 | 0.0600
+grainGrowthRate | 2.7d-6 | 1.0d-6 | 5.0d-6
+densScalOvrbdn | 0.0230 | 0.0115 | 0.0460
+tempScalOvrbdn | 0.0800 | 0.6000 | 1.0000
+baseViscosity | 9.0d+5 | 5.0d+5 | 1.5d+6
+! ====================================================================
+! water flow through snow
+! ====================================================================
+Fcapil | 0.0600 | 0.0100 | 0.1000
+k_snow | 0.0150 | 0.0050 | 0.0500
+mw_exp | 3.0000 | 1.0000 | 5.0000
+! ====================================================================
+! turbulent heat fluxes
+! ====================================================================
+z0Snow | 0.0010 | 0.0010 | 10.0000
+z0Soil | 0.0100 | 0.0010 | 10.0000
+z0Canopy | 0.1000 | 0.0010 | 10.0000
+zpdFraction | 0.6500 | 0.5000 | 0.8500
+critRichNumber | 0.2000 | 0.1000 | 1.0000
+Louis79_bparam | 9.4000 | 9.2000 | 9.6000
+Louis79_cStar | 5.3000 | 5.1000 | 5.5000
+Mahrt87_eScale | 1.0000 | 0.5000 | 2.0000
+leafExchangeCoeff | 0.0100 | 0.0010 | 0.1000
+windReductionParam | 0.2800 | 0.0000 | 1.0000
+! ====================================================================
+! stomatal conductance
+! ====================================================================
+Kc25 | 296.0770 | 296.0770 | 296.0770
+Ko25 | 0.2961 | 0.2961 | 0.2961
+Kc_qFac | 2.1000 | 2.1000 | 2.1000
+Ko_qFac | 1.2000 | 1.2000 | 1.2000
+kc_Ha | 79430.0000 | 79430.0000 | 79430.0000
+ko_Ha | 36380.0000 | 36380.0000 | 36380.0000
+vcmax25_canopyTop | 40.0000 | 20.0000 | 100.0000
+vcmax_qFac | 2.4000 | 2.4000 | 2.4000
+vcmax_Ha | 65330.0000 | 65330.0000 | 65330.0000
+vcmax_Hd | 220000.0000 | 149250.0000 | 149250.0000
+vcmax_Sv | 710.0000 | 485.0000 | 485.0000
+vcmax_Kn | 0.6000 | 0.0000 | 1.2000
+jmax25_scale | 2.0000 | 2.0000 | 2.0000
+jmax_Ha | 43540.0000 | 43540.0000 | 43540.0000
+jmax_Hd | 152040.0000 | 152040.0000 | 152040.0000
+jmax_Sv | 495.0000 | 495.0000 | 495.0000
+fractionJ | 0.1500 | 0.1500 | 0.1500
+quantamYield | 0.0500 | 0.0500 | 0.0500
+vpScaleFactor | 1500.0000 | 1500.0000 | 1500.0000
+cond2photo_slope | 9.0000 | 1.0000 | 10.0000
+minStomatalConductance | 2000.0000 | 2000.0000 | 2000.0000
+! ====================================================================
+! vegetation properties
+! ====================================================================
+winterSAI | 1.0000 | 0.0100 | 3.0000
+summerLAI | 3.0000 | 0.0100 | 10.0000
+rootScaleFactor1 | 2.0000 | 1.0000 | 10.0000
+rootScaleFactor2 | 5.0000 | 1.0000 | 10.0000
+rootingDepth | 0.5000 | 0.0100 | 10.0000
+rootDistExp | 1.0000 | 0.0100 | 1.0000
+plantWiltPsi | -150.0000 | -500.0000 | 0.0000
+soilStressParam | 5.8000 | 4.3600 | 6.3700
+critSoilWilting | 0.0750 | 0.0000 | 1.0000
+critSoilTranspire | 0.1750 | 0.0000 | 1.0000
+critAquiferTranspire | 0.2000 | 0.1000 | 10.0000
+minStomatalResistance | 50.0000 | 10.0000 | 200.0000
+leafDimension | 0.0400 | 0.0100 | 0.1000
+heightCanopyTop | 20.0000 | 0.0500 | 100.0000
+heightCanopyBottom | 2.0000 | 0.0000 | 5.0000
+specificHeatVeg | 874.0000 | 500.0000 | 1500.0000
+maxMassVegetation | 25.0000 | 1.0000 | 50.0000
+throughfallScaleSnow | 0.5000 | 0.1000 | 0.9000
+throughfallScaleRain | 0.5000 | 0.1000 | 0.9000
+refInterceptCapSnow | 6.6000 | 1.0000 | 10.0000
+refInterceptCapRain | 1.0000 | 0.0100 | 1.0000
+snowUnloadingCoeff | 0.0000 | 0.0000 | 1.5d-6
+canopyDrainageCoeff | 0.0050 | 0.0010 | 0.0100
+ratioDrip2Unloading | 0.4000 | 0.0000 | 1.0000
+canopyWettingFactor | 0.7000 | 0.0000 | 1.0000
+canopyWettingExp | 1.0000 | 0.0000 | 1.0000
+! ====================================================================
+! soil properties
+! ====================================================================
+soil_dens_intr | 2700.0000 | 500.0000 | 4000.0000
+thCond_soil | 5.5000 | 2.9000 | 8.4000
+frac_sand | 0.1600 | 0.0000 | 1.0000
+frac_silt | 0.2800 | 0.0000 | 1.0000
+frac_clay | 0.5600 | 0.0000 | 1.0000
+fieldCapacity | 0.2000 | 0.0000 | 1.0000
+wettingFrontSuction | 0.3000 | 0.1000 | 1.5000
+theta_mp | 0.4010 | 0.3000 | 0.6000
+theta_sat | 0.5500 | 0.3000 | 0.6000
+theta_res | 0.1390 | 0.0010 | 0.1000
+vGn_alpha | -0.8400 | -1.0000 | -0.0100
+vGn_n | 1.3000 | 1.0000 | 3.0000
+mpExp | 5.0000 | 1.0000 | 10.0000
+k_soil | 7.5d-06 | 1.d-07 | 100.d-07
+k_macropore | 1.0d-03 | 1.d-07 | 100.d-07
+kAnisotropic | 1.0000 | 0.0001 | 10.0000
+zScale_TOPMODEL | 2.5000 | 0.1000 | 100.0000
+compactedDepth | 1.0000 | 0.0000 | 1.0000
+aquiferScaleFactor | 0.3500 | 0.1000 | 100.0000
+aquiferBaseflowExp | 2.0000 | 1.0000 | 10.0000
+aquiferBaseflowRate | 2.0000 | 1.0000 | 10.0000
+qSurfScale | 50.0000 | 1.0000 | 100.0000
+specificYield | 0.2000 | 0.1000 | 0.3000
+specificStorage | 1.d-09 | 1.d-05 | 1.d-07
+f_impede | 2.0000 | 1.0000 | 10.0000
+soilIceScale | 0.1300 | 0.0001 | 1.0000
+soilIceCV | 0.4500 | 0.1000 | 5.0000
+! ====================================================================
+! algorithmic control parameters
+! ====================================================================
+minwind | 0.1000 | 0.0010 | 1.0000
+minstep | 1.0000 | 1.0000 | 1800.0000
+maxstep | 3600.0000 | 60.0000 | 1800.0000
+wimplicit | 0.0000 | 0.0000 | 1.0000
+maxiter | 100.0000 | 1.0000 | 100.0000
+relConvTol_liquid | 1.0d-3 | 1.0d-5 | 1.0d-1
+absConvTol_liquid | 1.0d-5 | 1.0d-8 | 1.0d-3
+relConvTol_matric | 1.0d-6 | 1.0d-5 | 1.0d-1
+absConvTol_matric | 1.0d-6 | 1.0d-8 | 1.0d-3
+relConvTol_energy | 1.0d-2 | 1.0d-5 | 1.0d-1
+absConvTol_energy | 1.0d-0 | 1.0d-2 | 1.0d+1
+relConvTol_aquifr | 1.0d-0 | 1.0d-2 | 1.0d+1
+absConvTol_aquifr | 1.0d-5 | 1.0d-5 | 1.0d-1
+zmin | 0.0100 | 0.0050 | 0.1000
+zmax | 0.0500 | 0.0100 | 0.5000
+! ---
+zminLayer1 | 0.0075 | 0.0075 | 0.0075
+zminLayer2 | 0.0100 | 0.0100 | 0.0100
+zminLayer3 | 0.0500 | 0.0500 | 0.0500
+zminLayer4 | 0.1000 | 0.1000 | 0.1000
+zminLayer5 | 0.2500 | 0.2500 | 0.2500
+! ---
+zmaxLayer1_lower | 0.0500 | 0.0500 | 0.0500
+zmaxLayer2_lower | 0.2000 | 0.2000 | 0.2000
+zmaxLayer3_lower | 0.5000 | 0.5000 | 0.5000
+zmaxLayer4_lower | 1.0000 | 1.0000 | 1.0000
+! ---
+zmaxLayer1_upper | 0.0300 | 0.0300 | 0.0300
+zmaxLayer2_upper | 0.1500 | 0.1500 | 0.1500
+zmaxLayer3_upper | 0.3000 | 0.3000 | 0.3000
+zmaxLayer4_upper | 0.7500 | 0.7500 | 0.7500
+! ====================================================================
+minTempUnloading | 270.16 | 260.16 | 273.16
+minWindUnloading | 0.0000 | 0.0000 | 10.000
+rateTempUnloading | 1.87d+5 | 1.0d+5 | 3.0d+5
+rateWindUnloading | 1.56d+5 | 1.0d+5 | 3.0d+5
+! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp1.txt! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp2.txt! history Mon Jul 20 16:08:17 2020: /pool0/home/andrbenn/data/summa_3/utils/convert_summa_config_v2_v3.py ./syntheticTestCases/colbeck1976/summa_fileManager_colbeck1976-exp3.txt
\ No newline at end of file
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp1.nc b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp1.nc
new file mode 100644
index 0000000000000000000000000000000000000000..fe66f1b13a4f825edc5398e43ad096e6bd3bee97
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp1.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp2.nc b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp2.nc
new file mode 100644
index 0000000000000000000000000000000000000000..70ccad244580e69de9da40f2aba6fec61bf7be6d
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp2.nc differ
diff --git a/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp3.nc b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp3.nc
new file mode 100644
index 0000000000000000000000000000000000000000..80c48dbdbea74010383403f94c4d543020df597f
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/settings/summa_zParamTrial_colbeck1976-exp3.nc differ
diff --git a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp1_G1-1_timestep.nc b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp1_G1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..9e6ae158fabce58a11b81c45cffc294b752b523c
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp1_G1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..fbfcc80186ef1b1a3a3ed88542dfe8e85c07f865
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp2_G1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc
new file mode 100644
index 0000000000000000000000000000000000000000..5244415ba0820a75a87db973f9ef0b05bc6c6627
Binary files /dev/null and b/utils/laugh_tests/colbeck1976/verification_data/colbeck1976-exp3_G1-1_timestep.nc differ
diff --git a/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt b/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt
new file mode 100644
index 0000000000000000000000000000000000000000..6ffb0dd15662a7bbe474e0cf29bcc9d66997b6c7
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/verification_data/runinfo.txt
@@ -0,0 +1 @@
+ Run start time on system: ccyy=2022 - mm=08 - dd=15 - hh=21 - mi=53 - ss=23.550
diff --git a/utils/laugh_tests/colbeck1976/verify_colbeck.py b/utils/laugh_tests/colbeck1976/verify_colbeck.py
new file mode 100644
index 0000000000000000000000000000000000000000..0394fb583cad070f25de0435eda4477de119be88
--- /dev/null
+++ b/utils/laugh_tests/colbeck1976/verify_colbeck.py
@@ -0,0 +1,93 @@
+from os import listdir
+from os.path import isfile, join
+from pathlib import Path
+import xarray as xr
+import numpy as np
+
+
+def verify(verified_data_path, data_to_compare_path, output_variables, numHRU):
+ try:
+ verified_dataset = xr.open_dataset(verified_data_path)
+ to_compare_dataset = xr.open_dataset(data_to_compare_path)
+ except FileNotFoundError:
+ print("Check the variables \'verified_data_path\' and \'data_to_compare_path\'. They may not point to the correct output files or the output filenames may have changed.")
+ exit()
+
+ # Get the HRUs from the dataset into a list
+ for iHRU in range(0, numHRU):
+ verified_hru = verified_dataset.isel(hru=iHRU).copy()
+ hru_to_compare = to_compare_dataset.isel(hru=iHRU).copy()
+
+ for var in output_variables:
+ try:
+ if len(verified_hru[var].values) != len(hru_to_compare[var].values):
+ print("ERROR: output variable", var, "does not contain the same amount of data")
+ print(" verified_hru = ", len(verified_hru[var].values))
+ print(" hru_to_compare = ", len(hru_to_compare[var].values))
+
+ verified_data = []
+ to_verify_data = []
+ if (verified_hru[var].values.ndim > 1):
+ # 2D output case
+ for list in verified_hru[var].values:
+ for data in list:
+ verified_data.append(data)
+
+ for list in hru_to_compare[var].values:
+ for data in list:
+ to_verify_data.append(data)
+
+ else:
+ # 1D output case
+ for data in verified_hru[var].values:
+ verified_data.append(data)
+
+ for data in hru_to_compare[var].values:
+ to_verify_data.append(data)
+
+
+ # check length
+ if len(verified_data) != len(to_verify_data):
+ print("ERROR: output variable", var, "does not contain the same amount of data")
+ print(" verified_hru = ", len(verified_data))
+ print(" hru_to_compare = ", len(to_verify_data))
+
+ # check values
+ for elem in range(0, len(verified_data)):
+ if verified_data[elem] != to_verify_data[elem]:
+ print("variable -",var, "has different values at", elem)
+ print(" verified_hru = ", verified_data[elem])
+ print(" hru_to_compare = ", to_verify_data[elem])
+ break
+
+ except TypeError:
+ print("variable - ", var, "Cannot be compared with len")
+ print(" verified_hru = ",verified_hru[var].values)
+ print(" hru_to_compare = ", hru_to_compare[var].values)
+
+
+numHRU = 1
+
+scalarRainfall = "scalarRainfall"
+scalarSnowfall = "scalarSnowfall"
+scalarRainPlusMelt = "scalarRainPlusMelt"
+mLayerVolFracLiq = "mLayerVolFracLiq"
+mLayerVolFracIce = "mLayerVolFracIce"
+iLayerNrgFlux = "iLayerNrgFlux"
+iLayerHeight = "iLayerHeight"
+mLayerDepth = "mLayerDepth"
+
+output_variables = [scalarRainfall, scalarSnowfall, scalarRainPlusMelt, mLayerVolFracLiq, \
+ mLayerVolFracIce, iLayerNrgFlux, iLayerHeight, mLayerDepth]
+
+verified_data_path = Path("./verification_data/colbeck1976-exp1_G1-1_timestep.nc")
+data_to_compare_path = Path("./output/colbeck1976-exp1GRU1-1_timestep.nc")
+verify(verified_data_path, data_to_compare_path, output_variables, numHRU)
+
+verified_data_path = Path("./verification_data/colbeck1976-exp2_G1-1_timestep.nc")
+data_to_compare_path = Path("./output/colbeck1976-exp2GRU1-1_timestep.nc")
+verify(verified_data_path, data_to_compare_path, output_variables, numHRU)
+
+verified_data_path = Path("./verification_data/colbeck1976-exp3_G1-1_timestep.nc")
+data_to_compare_path = Path("./output/colbeck1976-exp3GRU1-1_timestep.nc")
+verify(verified_data_path, data_to_compare_path, output_variables, numHRU)
\ No newline at end of file
diff --git a/utils/laugh_tests/miller1998/config/Summa_Actors_Settings.json b/utils/laugh_tests/miller1998/config/Summa_Actors_Settings.json
index cf3703231c75b9a338b56ba7dbd8155165fa98e3..08fb14cd120144c42490811dc25b0b393da33ea3 100644
--- a/utils/laugh_tests/miller1998/config/Summa_Actors_Settings.json
+++ b/utils/laugh_tests/miller1998/config/Summa_Actors_Settings.json
@@ -1,6 +1,6 @@
{
"DistributedSettings": {
- "distributed-mode": true,
+ "distributed-mode": false,
"host": "localhost",
"port": 4444
},
@@ -27,6 +27,6 @@
"HRUActor": {
"printOutput": true,
- "outputFrequency": 500
+ "outputFrequency": 1
}
-}
+}
\ No newline at end of file
diff --git a/utils/laugh_tests/mizoguchi1990/config/Summa_Actors_Settings.json b/utils/laugh_tests/mizoguchi1990/config/Summa_Actors_Settings.json
index cf3703231c75b9a338b56ba7dbd8155165fa98e3..85d67e14de7697397209c43e31815cf2312ce5a5 100644
--- a/utils/laugh_tests/mizoguchi1990/config/Summa_Actors_Settings.json
+++ b/utils/laugh_tests/mizoguchi1990/config/Summa_Actors_Settings.json
@@ -1,32 +1,32 @@
{
- "DistributedSettings": {
- "distributed-mode": true,
- "host": "localhost",
- "port": 4444
- },
-
- "SimulationSettings": {
- "total_hru_count": 100000,
- "num_hru_per_batch": 500
- },
-
- "SummaActor": {
- "OuputStructureSize": 250,
- "maxGRUPerJob": 250
- },
-
- "FileAccessActor": {
- "num_vectors_in_output_manager": 1
- },
+ "DistributedSettings": {
+ "distributed-mode": false,
+ "host": "localhost",
+ "port": 4444
+ },
- "JobActor": {
- "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
- "outputCSV": false,
- "csvPath": "/scratch/kck540/csv/"
- },
-
- "HRUActor": {
- "printOutput": true,
- "outputFrequency": 500
- }
-}
+ "SimulationSettings": {
+ "total_hru_count": 100000,
+ "num_hru_per_batch": 500
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 250,
+ "maxGRUPerJob": 250
+ },
+
+ "FileAccessActor": {
+ "num_vectors_in_output_manager": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
+ "outputCSV": false,
+ "csvPath": "/scratch/kck540/csv/"
+ },
+
+ "HRUActor": {
+ "printOutput": true,
+ "outputFrequency": 1
+ }
+}
\ No newline at end of file
diff --git a/utils/laugh_tests/vanderborght2005/config/Summa_Actors_Settings.json b/utils/laugh_tests/vanderborght2005/config/Summa_Actors_Settings.json
index cf3703231c75b9a338b56ba7dbd8155165fa98e3..85d67e14de7697397209c43e31815cf2312ce5a5 100644
--- a/utils/laugh_tests/vanderborght2005/config/Summa_Actors_Settings.json
+++ b/utils/laugh_tests/vanderborght2005/config/Summa_Actors_Settings.json
@@ -1,32 +1,32 @@
{
- "DistributedSettings": {
- "distributed-mode": true,
- "host": "localhost",
- "port": 4444
- },
-
- "SimulationSettings": {
- "total_hru_count": 100000,
- "num_hru_per_batch": 500
- },
-
- "SummaActor": {
- "OuputStructureSize": 250,
- "maxGRUPerJob": 250
- },
-
- "FileAccessActor": {
- "num_vectors_in_output_manager": 1
- },
+ "DistributedSettings": {
+ "distributed-mode": false,
+ "host": "localhost",
+ "port": 4444
+ },
- "JobActor": {
- "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
- "outputCSV": false,
- "csvPath": "/scratch/kck540/csv/"
- },
-
- "HRUActor": {
- "printOutput": true,
- "outputFrequency": 500
- }
-}
+ "SimulationSettings": {
+ "total_hru_count": 100000,
+ "num_hru_per_batch": 500
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 250,
+ "maxGRUPerJob": 250
+ },
+
+ "FileAccessActor": {
+ "num_vectors_in_output_manager": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
+ "outputCSV": false,
+ "csvPath": "/scratch/kck540/csv/"
+ },
+
+ "HRUActor": {
+ "printOutput": true,
+ "outputFrequency": 1
+ }
+}
\ No newline at end of file
diff --git a/utils/laugh_tests/wigmosta1999/config/Summa_Actors_Settings.json b/utils/laugh_tests/wigmosta1999/config/Summa_Actors_Settings.json
index cf3703231c75b9a338b56ba7dbd8155165fa98e3..85d67e14de7697397209c43e31815cf2312ce5a5 100644
--- a/utils/laugh_tests/wigmosta1999/config/Summa_Actors_Settings.json
+++ b/utils/laugh_tests/wigmosta1999/config/Summa_Actors_Settings.json
@@ -1,32 +1,32 @@
{
- "DistributedSettings": {
- "distributed-mode": true,
- "host": "localhost",
- "port": 4444
- },
-
- "SimulationSettings": {
- "total_hru_count": 100000,
- "num_hru_per_batch": 500
- },
-
- "SummaActor": {
- "OuputStructureSize": 250,
- "maxGRUPerJob": 250
- },
-
- "FileAccessActor": {
- "num_vectors_in_output_manager": 1
- },
+ "DistributedSettings": {
+ "distributed-mode": false,
+ "host": "localhost",
+ "port": 4444
+ },
- "JobActor": {
- "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
- "outputCSV": false,
- "csvPath": "/scratch/kck540/csv/"
- },
-
- "HRUActor": {
- "printOutput": true,
- "outputFrequency": 500
- }
-}
+ "SimulationSettings": {
+ "total_hru_count": 100000,
+ "num_hru_per_batch": 500
+ },
+
+ "SummaActor": {
+ "OuputStructureSize": 250,
+ "maxGRUPerJob": 250
+ },
+
+ "FileAccessActor": {
+ "num_vectors_in_output_manager": 1
+ },
+
+ "JobActor": {
+ "FileManagerPath": "/gladwell/kck540/SummaActorsSettings/fileManager.txt",
+ "outputCSV": false,
+ "csvPath": "/scratch/kck540/csv/"
+ },
+
+ "HRUActor": {
+ "printOutput": true,
+ "outputFrequency": 1
+ }
+}
\ No newline at end of file