Organize Villara tests.

bigladder · Nov 11, 2024 · 608ba63 · 608ba63
1 parent 9b334f9
commit 608ba63
Show file tree

Hide file tree

Showing 11 changed files with 1,467 additions and 1,531 deletions.
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -139,12 +139,7 @@ set(yearLargeTestsModels
         TamScalable_SP
         Scalable_MP
         )
-set(heatExchangeModelNames
-        AquaThermAire
-        )
-set(heatExchangeTests
-        villara_24hr67
-        )
+
 set(yearLargeTests
         testCA_36Unit_CTZ12
         )
@@ -160,6 +155,13 @@ set(stateOfChargeCompressorNames
         NyleC25A_SP
         )
 
+#
+set(Villara_AquaThermAireDir "Villara/AquaThermAire")
+set(Villara_AquaThermAireTests
+        villara_24hr67
+        )
+
+#
 set(BradfordWhiteAeroThermRE2Dir "BradfordWhite/AeroThermRE2H")
 set(BradfordWhiteAeroThermRE2HSizes 50 65 80)
 set(BradfordWhiteAeroThermRE2H50_Tests
@@ -175,6 +177,7 @@ set(BradfordWhiteAeroThermRE2H80_Tests
         RE2H80_UEF67
         )
 
+#
 set(LG_APHWC50Dir "LG/LG_APHWC50")
 set(LG_APHWC50_Tests
         DOE2014_LGC50_24hr50
@@ -183,11 +186,6 @@ set(LG_APHWC50_Tests
         DP_LGC50_HVT
         )
 
-set(plotTest File AquaThermAire villara_24hr67)
-
-list(APPEND extendedModelNames ${modelNames} ${heatExchangeModelNames})
-list(REMOVE_DUPLICATES extendedModelNames)
-
 cmake_dependent_option(${PROJECT_NAME}_PYTHON_PLOTS "Generate plots using python comparing measured and simulated data" ON "${PROJECT_NAME}_IS_TOP_LEVEL" OFF)
 
 if (${PROJECT_NAME}_PYTHON_PLOTS AND NOT ${PROJECT_NAME}_PYTHON_SETUP)
@@ -259,12 +257,11 @@ foreach (test ${testNames})
     endforeach (model)
 endforeach (test)
 
-#Test(s) specifically for heat-exchange models
-foreach (test ${heatExchangeTests})
-    foreach (model ${heatExchangeModelNames})
-        add_model_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "Preset")
-        add_model_test(TEST_NAME "${test}" MODEL_NAME "${model}" SPEC_TYPE "File")
-    endforeach (model)
+#Test(s) specifically for Villara AquaThermAire model
+foreach (test ${Villara_AquaThermAireTests})
+    set(fullTestName "Villara/AquaThermAire/${test}")
+    add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "AquaThermAire" SPEC_TYPE "Preset")
+    add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "AquaThermAire" SPEC_TYPE "File")
 endforeach (test)
 
 #Test(s) specifically for Bradford White AeroTherm model
@@ -278,13 +275,15 @@ foreach (size ${BradfordWhiteAeroThermRE2HSizes})
     endforeach (test)
 endforeach (size)
 
-#Test(s) specifically for LG_APHWC50 model
+#Test(s) specifically for LG APHWC50 model
 foreach (test ${LG_APHWC50_Tests})
     set(fullTestName "${LG_APHWC50Dir}/${test}")
     add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "LG_APHWC50" SPEC_TYPE "Preset")
     add_model_test(TEST_NAME "${fullTestName}" MODEL_NAME "LG_APHWC50" SPEC_TYPE "File")
 endforeach (test)
 
+add_plot_test(SPEC_TYPE "Preset" MODEL_NAME "AquaThermAire" TEST_NAME "villara_24hr67" )
+
 # Tests for differences between File and Preset versions
 function(add_file_test)
     set(options)
@@ -310,11 +309,9 @@ foreach (test ${testNames})
     endforeach (model)
 endforeach (test)
 
-#Test(s) specifically for heat-exchange models
-foreach (test ${heatExchangeTests})
-    foreach (model ${heatExchangeModelNames})
-        add_file_test(TEST_NAME "${test}" MODEL_NAME "${model}")
-    endforeach (model)
+#Test(s) specifically for Villara AquaThermAire model
+foreach (test ${Villara_AquaThermAireTests})
+    add_file_test(TEST_NAME "${test}" MODEL_NAME "AquaThermAire")
 endforeach (test)
 
 #Test(s) specifically for Bradford White AeroTherm model
@@ -356,6 +353,11 @@ foreach (test ${testNames})
     endforeach (model)
 endforeach (test)
 
+#Test(s) specifically for Villara AquaThermAire model
+foreach (test ${Villara_AquaThermAireTests})
+    add_regression_test(TEST_NAME "${test}" MODEL_NAME "AquaThermAire" SPEC_TYPE "Preset")
+endforeach (test)
+
 #Test(s) specifically for Bradford White AeroTherm model
 foreach (size ${BradfordWhiteAeroThermRE2HSizes})
     set(model BradfordWhiteAeroThermRE2H${size})
@@ -425,8 +427,6 @@ foreach (test ${yearLargeTests})
     endforeach (model)
 endforeach (test)
 
-add_plot_test(SPEC_TYPE "Preset" MODEL_NAME "AquaThermAire" TEST_NAME "villara_24hr67" )
-
 #Add regression test for yearly file
 add_test(NAME "RegressionTest.YearRuns" COMMAND ${CMAKE_COMMAND} -E compare_files "${CMAKE_CURRENT_BINARY_DIR}/output/DHW_YRLY.csv" "${CMAKE_CURRENT_SOURCE_DIR}/ref/DHW_YRLY.csv")
 

diff --git a/test/villara_24hr67/DRschedule.csv → ...uaThermAire/villara_24hr67/DRschedule.csv b/test/villara_24hr67/DRschedule.csv → ...uaThermAire/villara_24hr67/DRschedule.csv
diff --git a/test/villara_24hr67/ambientTschedule.csv → ...mAire/villara_24hr67/ambientTschedule.csv b/test/villara_24hr67/ambientTschedule.csv → ...mAire/villara_24hr67/ambientTschedule.csv
diff --git a/test/villara_24hr67/drawschedule.csv → ...ThermAire/villara_24hr67/drawschedule.csv b/test/villara_24hr67/drawschedule.csv → ...ThermAire/villara_24hr67/drawschedule.csv
diff --git a/test/villara_24hr67/evaporatorTschedule.csv → ...re/villara_24hr67/evaporatorTschedule.csv b/test/villara_24hr67/evaporatorTschedule.csv → ...re/villara_24hr67/evaporatorTschedule.csv
diff --git a/test/villara_24hr67/inletTschedule.csv → ...ermAire/villara_24hr67/inletTschedule.csv b/test/villara_24hr67/inletTschedule.csv → ...ermAire/villara_24hr67/inletTschedule.csv
diff --git a/test/villara_24hr67/measured.csv → ...AquaThermAire/villara_24hr67/measured.csv b/test/villara_24hr67/measured.csv → ...AquaThermAire/villara_24hr67/measured.csv
diff --git a/test/villara_24hr67/testInfo.txt → ...AquaThermAire/villara_24hr67/testInfo.txt b/test/villara_24hr67/testInfo.txt → ...AquaThermAire/villara_24hr67/testInfo.txt
diff --git a/test/villara_24hr67/villara_24hr67.csv → ...ermAire/villara_24hr67/villara_24hr67.csv b/test/villara_24hr67/villara_24hr67.csv → ...ermAire/villara_24hr67/villara_24hr67.csv
diff --git a/test/ref/villara_24hr67_Preset_AquaThermAire.csv b/test/ref/villara_24hr67_Preset_AquaThermAire.csv
diff --git a/test/villara_24hr67/measurements.csv b/test/villara_24hr67/measurements.csv