merged nrcan_357 and resolved conflicts

NREL · Nov 9, 2022 · 1d5d86c · 1d5d86c
2 parents 5b80bc9 + 7cd0e5b
commit 1d5d86c
Show file tree

Hide file tree

Showing 399 changed files with 4,405,482 additions and 2,160,530 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,6 +25,13 @@ coverage/
 /spec/reports/
 /test/reports
 /test/necb/data/*test_results.csv
+/test/necb/*/expected_results/*_test_results.csv
+/test/necb/*/expected_results/*_test_results.json
+/test/necb/*/expected_results/*_test_result.idf
+/test/necb/*/expected_results/*_test_result.osm
+/test/necb/*/expected_results/*_diffs.json
+/test/necb/*/tests/before.osm
+/test/necb/*/tests/after.osm
 
 # auto generated CI files
 /test/ci_test_files/models

diff --git a/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.ddy b/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.ddy
diff --git a/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.epw b/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.epw
diff --git a/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.stat b/data/weather/CAN_ON_Kingston.AP.718200_TMYx.2004-2018.stat
diff --git a/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.ddy b/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.ddy
diff --git a/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.epw b/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.epw
diff --git a/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.stat b/data/weather/CAN_ON_Region.of.Waterloo.Intl.AP.713680_TMYx.2004-2018.stat
diff --git a/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.ddy b/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.ddy
diff --git a/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.epw b/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.epw
diff --git a/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.stat b/data/weather/CAN_ON_Sarnia-Hadfield.AP.717040_TMYx.2004-2018.stat
diff --git a/data/weather/CAN_QC_Gatineau.AP.716279_TMYx.2004-2018.ddy b/data/weather/CAN_QC_Gatineau.AP.716279_TMYx.2004-2018.ddy