Merge branch 'main' into python-3.13

NREL · Dec 3, 2024 · d547981 · d547981
2 parents a4d0026 + e2d28b7
commit d547981
Show file tree

Hide file tree

Showing 21 changed files with 712 additions and 1,686 deletions.
diff --git a/.gitignore b/.gitignore
@@ -148,3 +148,40 @@ ground_loads.csv
 Loadings.csv
 SimulationSummary.*
 TimeDependentValues.csv
+*.err
+_loop_order.json
+baseline_scenario.zip
+building_loads.csv
+data_point.zip
+data_point_out.*
+data_point_reports.zip
+default_feature_report.*
+default_feature_reports.*
+default_scenario_report.*
+default_scenario_reports.*
+eplusout.*
+eplusssz.*
+eplustbl.*
+epluszsz.*
+feature_comparison.html
+finished.job
+future_*
+historical_*
+historical_annual
+in.*
+measure_attributes.json
+modelica.mos
+out.*
+pre-preprocess.*
+pre-process.*
+precess_status.json
+process_status.jso
+process_status.json
+report.*
+reports/
+results.json
+run_status.json
+scenarioData.js
+sqlite.err
+started.job
+stdout-energyplus
diff --git a/...tput_skeleton_13_buildings/exportGeo.json → ...put_skeleton_13_buildings/network.geojson b/...tput_skeleton_13_buildings/exportGeo.json → ...put_skeleton_13_buildings/network.geojson
diff --git a/demos/sdk_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/_loop_order.json b/demos/sdk_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/_loop_order.json
diff --git a/...k_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_proportional.json b/...k_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_proportional.json
@@ -494,7 +494,7 @@
         "insulation_thickness": 0.2,
         "insulation_conductivity": 2.3,
         "diameter_ratio": 11,
-        "roughness": 1e-06,
+        "roughness": 1e-6,
         "rho_cp": 2139000,
         "number_of_segments": 1,
         "buried_depth": 1.5
@@ -504,7 +504,7 @@
         "pump_flow_rate": 0.01
       },
       "ghe_parameters": {
-        "version": "0.2.5",
+        "version": "0.3.0",
         "ghe_dir": "../ccc/run/baseline_scenario/ghe_dir",
         "fluid": {
           "fluid_name": "Water",
@@ -519,7 +519,7 @@
           "inner_diameter": 0.0216,
           "outer_diameter": 0.0266,
           "shank_spacing": 0.0323,
-          "roughness": 1e-06,
+          "roughness": 1e-6,
           "conductivity": 0.4,
           "rho_cp": 1542000,
           "arrangement": "singleutube"

diff --git a/...s/sdk_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_upstream.json b/...s/sdk_output_skeleton_13_buildings/run/baseline_scenario/ghe_dir/sys_params_upstream.json
@@ -494,7 +494,7 @@
         "insulation_thickness": 0.2,
         "insulation_conductivity": 2.3,
         "diameter_ratio": 11,
-        "roughness": 1e-06,
+        "roughness": 1e-6,
         "rho_cp": 2139000,
         "number_of_segments": 1,
         "buried_depth": 1.5
@@ -504,7 +504,7 @@
         "pump_flow_rate": 0.01
       },
       "ghe_parameters": {
-        "version": "0.2.5",
+        "version": "0.3.0",
         "ghe_dir": "../ccc/run/baseline_scenario/ghe_dir",
         "fluid": {
           "fluid_name": "Water",
@@ -519,7 +519,7 @@
           "inner_diameter": 0.0216,
           "outer_diameter": 0.0266,
           "shank_spacing": 0.0323,
-          "roughness": 1e-06,
+          "roughness": 1e-6,
           "conductivity": 0.4,
           "rho_cp": 1542000,
           "arrangement": "singleutube"

diff --git a/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/_loop_order.json b/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/_loop_order.json
diff --git a/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params.json b/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params.json
@@ -94,7 +94,7 @@
         "pump_flow_rate": 0.01
       },
       "ghe_parameters": {
-        "version": "0.2.5",
+        "version": "0.3.0",
         "ghe_dir": "tests\\management\\data\\sdk_project_scraps\\run\\baseline_scenario\\ghe_dir",
         "fluid": {
           "fluid_name": "Water",

diff --git a/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params_detailed_geo.json b/demos/sdk_output_skeleton_1_ghe/run/baseline_scenario/ghe_dir/sys_params_detailed_geo.json
@@ -84,7 +84,7 @@
         "insulation_thickness": 0.2,
         "insulation_conductivity": 2.3,
         "diameter_ratio": 11,
-        "roughness": 1e-06,
+        "roughness": 1e-6,
         "rho_cp": 2139000,
         "number_of_segments": 1,
         "buried_depth": 1.5
@@ -94,7 +94,7 @@
         "pump_flow_rate": 0.01
       },
       "ghe_parameters": {
-        "version": "0.2.5",
+        "version": "0.3.0",
         "ghe_dir": "tests\\management\\data\\sdk_project_scraps\\run\\baseline_scenario\\ghe_dir",
         "fluid": {
           "fluid_name": "Water",
@@ -109,7 +109,7 @@
           "inner_diameter": 0.0216,
           "outer_diameter": 0.0266,
           "shank_spacing": 0.0323,
-          "roughness": 1e-06,
+          "roughness": 1e-6,
           "conductivity": 0.4,
           "rho_cp": 1542000,
           "arrangement": "singleutube"