Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modifications for GHE #526

Merged
merged 13 commits into from
Mar 23, 2023
Merged

Modifications for GHE #526

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
21ef8e5
Add GHE properties to system parameter
tanushree04 Feb 2, 2023
1e5a109
add ghe parameters
tanushree04 Feb 10, 2023
b230bc8
add end of file line
tanushree04 Feb 11, 2023
899555f
Add test
tanushree04 Feb 14, 2023
278c168
modify schema
tanushree04 Feb 14, 2023
32cb2b7
additional properties
tanushree04 Feb 23, 2023
55161e8
run precommit
tanushree04 Mar 1, 2023
376e21a
add description and default
tanushree04 Mar 14, 2023
3bae0df
Merge branch 'develop' into ghe
tanushree04 Mar 14, 2023
701592c
pre-commit
vtnate Mar 14, 2023
d41af3d
Merge branch 'ghe' of https://github.com/urbanopt/geojson-modelica-tr…
tanushree04 Mar 15, 2023
2ff6522
add schema changes
tanushree04 Mar 22, 2023
14b622e
edit default
tanushree04 Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions geojson_modelica_translator/system_parameters/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's a typo here I didn't catch earlier. Should be 0.15 m (should have been 0.075 before this change).

}
}
},
Expand Down Expand Up @@ -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": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we missing "description" and "type" object attributes here?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to have some further discussion around these. The length and width should be filled by the GeoJSON inputs. The rest are OK to expose to the user.

Expand Down
6 changes: 3 additions & 3 deletions tests/system_parameters/data/system_params_ghe.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -132,7 +132,7 @@
"borehole": {
"length": 96.0,
"buried_depth": 2.0,
"radius": 0.075
"diameter": 0.15
}
}
}
9 changes: 4 additions & 5 deletions tests/system_parameters/data/system_params_ghe_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
9 changes: 4 additions & 5 deletions tests/system_parameters/data/system_params_ghe_3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down