add schema changes

urbanopt · Mar 22, 2023 · 2ff6522 · 2ff6522
1 parent d41af3d
commit 2ff6522
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 25 deletions.
diff --git a/geojson_modelica_translator/system_parameters/schema.json b/geojson_modelica_translator/system_parameters/schema.json
@@ -1294,12 +1294,12 @@
       "description": "Pipe properties for Ground Heat Exchanger sizing",
       "type": "object",
       "properties": {
-        "inner_radius": {
-          "description": "The radius of the inner pipe surface, in meters.",
+        "inner_diameter": {
+          "description": "The diameter of the inner pipe surface, in meters.",
           "type": "number"
         },
-        "outer_radius": {
-          "description": "The radius of the outer pipe surface, in meters.",
+        "outer_diameter": {
+          "description": "The diameter of the outer pipe surface, in meters.",
           "type": "number",
           "minimum": 0
         },
@@ -1346,10 +1346,10 @@
           "description": "The depth below the ground surface to the top of the borehole, in meters.",
           "type": "number"
         },
-        "radius": {
-          "description": "The radius of the borehole, in meters.",
+        "diameter": {
+          "description": "The diameter of the borehole, in meters.",
           "type": "number",
-          "default": 0.095
+          "default": 0.19
         }
       }
     },
@@ -1400,11 +1400,6 @@
         "description": "Length of ground heat exchanger sizing period, in months.",
         "type": "integer",
         "minimum": 0
-      },
-      "timestep": {
-        "description": "Timestep method used for ground heat exchanger sizing.",
-        "type": "string",
-        "const": "hybrid"
       }
     },
     "geometric_constraints_def": {

diff --git a/tests/system_parameters/data/system_params_ghe.json b/tests/system_parameters/data/system_params_ghe.json
@@ -122,8 +122,8 @@
       "undisturbed_temp": 18.3
     },
     "pipe": {
-      "inner_radius": 0.0108,
-      "outer_radius": 0.0133,
+      "inner_diameter": 0.0216,
+      "outer_diameter": 0.0266,
       "shank_spacing": 0.0323,
       "roughness": 1e-06,
       "conductivity": 0.4,
@@ -132,7 +132,7 @@
     "borehole": {
       "length": 96.0,
       "buried_depth": 2.0,
-      "radius": 0.075
+      "diameter": 0.15
     }
   }
 }
diff --git a/tests/system_parameters/data/system_params_ghe_2.json b/tests/system_parameters/data/system_params_ghe_2.json
@@ -223,8 +223,8 @@
       "undisturbed_temp": 18.3
     },
     "pipe": {
-      "inner_radius": 0.0108,
-      "outer_radius": 0.0133,
+      "inner_diameter": 0.0216,
+      "outer_diameter": 0.0266,
       "shank_spacing": 0.0323,
       "roughness": 1e-06,
       "conductivity": 0.4,
@@ -233,11 +233,10 @@
     },
     "borehole": {
       "buried_depth": 2.0,
-      "radius": 0.075
+      "diameter": 0.15
     },
     "simulation": {
-      "num_months": 240,
-      "timestep": "hybrid"
+      "num_months": 240
     },
     "geometric_constraints": {
       "length": 100,

diff --git a/tests/system_parameters/data/system_params_ghe_3.json b/tests/system_parameters/data/system_params_ghe_3.json
@@ -223,8 +223,8 @@
       "undisturbed_temp": 18.3
     },
     "pipe": {
-      "inner_radius": 0.0108,
-      "outer_radius": 0.0133,
+      "inner_diameter": 0.0216,
+      "outer_diameter": 0.0266,
       "shank_spacing": 0.0323,
       "roughness": 1e-06,
       "conductivity": -1,
@@ -233,11 +233,10 @@
     },
     "borehole": {
       "buried_depth": 2.0,
-      "radius": 0.075
+      "diameter": 0.15
     },
     "simulation": {
-      "num_months": 240,
-      "timestep": "hybrid"
+      "num_months": 240
     },
     "geometric_constraints": {
       "length": 100,