Merge branch 'main' of https://github.com/nklammer/MORmod_mf into main

nklammer · Jun 20, 2021 · ba4aca2 · ba4aca2
2 parents 01e0850 + 24c31cc
commit ba4aca2
Show file tree

Hide file tree

Showing 12 changed files with 186,321 additions and 168,663 deletions.
diff --git a/d_view_output.xlsx b/d_view_output.xlsx
diff --git a/osw_mf_custom_meter/in_upto.osm b/osw_mf_custom_meter/in_upto.osm
diff --git a/osw_mf_custom_meter/ze_multifamily/in.osm b/osw_mf_custom_meter/ze_multifamily/in.osm
diff --git a/osw_mf_custom_meter/ze_multifamily/in/files/USA_CA_Los.Angeles.Intl.AP.722950_TMY3.epw b/osw_mf_custom_meter/ze_multifamily/in/files/USA_CA_Los.Angeles.Intl.AP.722950_TMY3.epw
diff --git a/osw_mf_custom_meter/ze_multifamily/in/files/USA_CA_Sacramento.Metro.AP.724839_TMY3.epw b/osw_mf_custom_meter/ze_multifamily/in/files/USA_CA_Sacramento.Metro.AP.724839_TMY3.epw
diff --git a/osw_mf_custom_meter/ze_multifamily/run/eplusout.mdd b/osw_mf_custom_meter/ze_multifamily/run/eplusout.mdd
@@ -1,4 +1,4 @@
-! Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2021.05.26 20:38,
+! Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2021.06.09 13:46,
 ! Output:Meter Objects (applicable to this run)
 Output:Meter,Electricity:Facility,hourly; !- [J]
 Output:Meter:Cumulative,Electricity:Facility,hourly; !- [J]
@@ -294,10 +294,10 @@ Output:Meter,Electricity:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter:Cumulative,Electricity:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter,InteriorLights:Electricity:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter:Cumulative,InteriorLights:Electricity:Zone:COMMUNITY_RM,hourly; !- [J]
-Output:Meter,Electricity:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter:Cumulative,Electricity:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter,InteriorLights:Electricity:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter:Cumulative,InteriorLights:Electricity:Zone:CORRIDOR,hourly; !- [J]
+Output:Meter,Electricity:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter:Cumulative,Electricity:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter,InteriorLights:Electricity:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter:Cumulative,InteriorLights:Electricity:Zone:CORRIDOR 1,hourly; !- [J]
 Output:Meter,Electricity:Zone:CORRIDOR_2,hourly; !- [J]
 Output:Meter:Cumulative,Electricity:Zone:CORRIDOR_2,hourly; !- [J]
 Output:Meter,InteriorLights:Electricity:Zone:CORRIDOR_2,hourly; !- [J]
@@ -1374,12 +1374,12 @@ Output:Meter,Heating:EnergyTransfer:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter:Cumulative,Heating:EnergyTransfer:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter,Cooling:EnergyTransfer:Zone:COMMUNITY_RM,hourly; !- [J]
 Output:Meter:Cumulative,Cooling:EnergyTransfer:Zone:COMMUNITY_RM,hourly; !- [J]
-Output:Meter,EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter:Cumulative,EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter,Heating:EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter:Cumulative,Heating:EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter,Cooling:EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
-Output:Meter:Cumulative,Cooling:EnergyTransfer:Zone:CORRIDOR,hourly; !- [J]
+Output:Meter,EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter:Cumulative,EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter,Heating:EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter:Cumulative,Heating:EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter,Cooling:EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
+Output:Meter:Cumulative,Cooling:EnergyTransfer:Zone:CORRIDOR 1,hourly; !- [J]
 Output:Meter,EnergyTransfer:Zone:CORRIDOR_2,hourly; !- [J]
 Output:Meter:Cumulative,EnergyTransfer:Zone:CORRIDOR_2,hourly; !- [J]
 Output:Meter,Heating:EnergyTransfer:Zone:CORRIDOR_2,hourly; !- [J]

diff --git a/osw_mf_custom_meter/ze_multifamily/run/eplusout.mtd b/osw_mf_custom_meter/ze_multifamily/run/eplusout.mtd
diff --git a/osw_mf_custom_meter/ze_multifamily/run/eplusout.rdd b/osw_mf_custom_meter/ze_multifamily/run/eplusout.rdd
@@ -1,4 +1,4 @@
-! Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2021.05.26 20:38,
+! Program Version,EnergyPlus, Version 9.3.0-baff08990c, YMD=2021.06.09 13:46,
 ! Output:Variable Objects (applicable to this run)
 Output:Variable,*,Site Outdoor Air Drybulb Temperature,hourly; !- Zone Average [C]
 Output:Variable,*,Site Outdoor Air Dewpoint Temperature,hourly; !- Zone Average [C]