Merge pull request #1144 from NREL/pnnl_fix_secondaryschool_geometry

fix an error in the secondary school geometry file
NREL · Jul 30, 2021 · 784fadd · 784fadd
2 parents 2012e32 + 0b81460
commit 784fadd
Show file tree

Hide file tree

Showing 50 changed files with 349,398 additions and 349,428 deletions.
diff --git a/data/geometry/ASHRAESecondarySchool.osm b/data/geometry/ASHRAESecondarySchool.osm
@@ -3465,10 +3465,10 @@ OS:Surface,
 
 OS:SubSurface,
   {840a7df4-740c-4408-8c73-04780c0c04ff}, !- Handle
-  Aux_Gym_ZN_1_FLR_2_Wall_2_window_1,     !- Name
+  Aux_Gym_ZN_1_FLR_1_Wall_2_window_1,     !- Name
   FixedWindow,                            !- Sub Surface Type
   ,                                       !- Construction Name
-  {45cb91c4-6082-4294-8acd-ba3623d35030}, !- Surface Name
+  {2b46bc89-e8f9-4905-afed-89ef2b8faaf9}, !- Surface Name
   ,                                       !- Outside Boundary Condition Object
   ,                                       !- View Factor to Ground
   ,                                       !- Shading Control Name

diff --git a/data/standards/test_performance_expected_dd_results.csv b/data/standards/test_performance_expected_dd_results.csv
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/.../regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/.../regression_models/FullServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...type/regression_models/HighriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...type/regression_models/HighriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...doe_prototype/regression_models/Hospital-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/LargeHotel-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/..._prototype/regression_models/LargeOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/..._prototype/regression_models/LargeOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...prototype/regression_models/MediumOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...prototype/regression_models/MediumOffice-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/MidriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/MidriseApartment-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/Outpatient-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/Outpatient-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/Outpatient-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/Outpatient-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...e_prototype/regression_models/Outpatient-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...e_prototype/regression_models/Outpatient-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...rototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...rototype/regression_models/PrimarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...rototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...rototype/regression_models/PrimarySchool-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...rototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...rototype/regression_models/PrimarySchool-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...regression_models/QuickServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...regression_models/QuickServiceRestaurant-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...regression_models/QuickServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...regression_models/QuickServiceRestaurant-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...regression_models/QuickServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...regression_models/QuickServiceRestaurant-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/RetailStandalone-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/RetailStandalone-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/RetailStandalone-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/RetailStandalone-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...otype/regression_models/RetailStandalone-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...otype/regression_models/RetailStandalone-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...totype/regression_models/RetailStripmall-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...totype/regression_models/RetailStripmall-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...totype/regression_models/RetailStripmall-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm b/...totype/regression_models/RetailStripmall-90.1-2013-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...totype/regression_models/RetailStripmall-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm b/...totype/regression_models/RetailStripmall-90.1-2016-ASHRAE 169-2013-4A_expected_result.osm
diff --git a/...totype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm b/...totype/regression_models/SecondarySchool-90.1-2004-ASHRAE 169-2013-4A_expected_result.osm