TNO Intern

Commit d8a9bf71 authored by Zanne Korevaar's avatar Zanne Korevaar
Browse files

Merge branch '16-fix-bug-qzb' into 'main'

Resolve "fix bug qzb"

Closes #16

See merge request !17
parents 71307cd9 463347d3
Loading
Loading
Loading
Loading
Loading
+24 −24
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ The main input JSON file includes the following parameters:
| optimize_keys_bounds | Bounds for optimized parameters                                        | —       | nested_list    | `[[lower, upper]]` matching optimize_keys                                                                                                                                                         |
| loadprofile          | Path to configuration file of the heat load profile                    | —       | string         | Optional                                                                                                                                                                                          |
| flow_data            | Path to configuration file of the flow rate profile                    | -       | string         | Optional                                                                                                                                                                                          |
| Q                    | Power demand                                                           | W       | scalar         | Used if `run_type` is POWER and no `loadprofile` defined                                                                                                                                          |
| Q                    | Power demand                                                           | W       | scalar         | Used if `run_type` is POWER and no `loadprofile` defined; positive for heat production, negative for cold production                                                                              |
| Tin                  | Inlet temperature                                                      | °C      | scalar         | Used if `run_type` is TIN                                                                                                                                                                         |
| variables_config     | Path to stochastic simulation configuration file                       | —       | string         | Used for stochastic runs (RunMain module)                                                                                                                                                         |
| save_Tfield_res      | Flag to save results of 3D temperature field in a numarical simulation | —       | boolean        | Only used if model_type is FINVOL                                                                                                                                                                 |
@@ -272,7 +272,7 @@ of the parameters in the *results* subset is always the number of
samples.

| Parameter | Description                                           | Unit  | Dimensions         | Remark                                                            |
|-----------|-------------------------------------------------------|-------|--------------------|---------------------------------------------|
|-----------|-------------------------------------------------------|-------|--------------------|-------------------------------------------------------------------|
| Q_b       | Heat load                                             | W     | time               | Only calculated for run_type TIN                                  |
| Re_in     | Reynolds nr. in the inlet pipe(s)                     |       | time               |                                                                   |
| Re_out    | Reynolds nr. in the outlet pipe(s)                    |       | time               |                                                                   |
@@ -288,8 +288,8 @@ samples.
| k_g       | Grout thermal conductivity                            | W/mK  | time or time; zseg |                                                                   |
| k_s       | Subsurface thermal conductivity                       | W/mK  | time or time; zseg |                                                                   |
| qloop     | Consumed power by the fluid circulation pump          | W     | time               |                                                                   |
| qsign     | Sign of heat flow                                     |       | time               | Sign indicates heat extraction or injection |
| qzb       | Subsurface heat flow                                  | W/m   | time; zseg         |                                             |
| qsign     | Sign of heat flow                                     |       | time               | Sign indicates heat extraction (positive) or injection (negative) |
| qzb       | Subsurface heat flow                                  | W     | time; zseg         |                                                                   |
| nPipes    | Number of pipes                                       |       |                    | Coördinates for the nPipes dimension                              |
| time      | Simulation timesteps                                  | hours |                    | Coördinates for the time dimension                                |
| z         | Depth for top and bottom of simulation depth segments | m     |                    | Coördinates for the depth dimension                               |
+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "geoloop"
version = "1.0.4"
version = "1.0.5"
description = "This is a Python package for simulation of (deep) vertical Borehole Heat Exchanger (BHE) systems"
authors = [
    { name = "Zanne Korevaar", email = "zanne.korevaar@tno.nl" },
+3 −3
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ class SingleRunResult:
        flowrate : np.ndarray
            Mass flow rate over time [kg/s].
        qsign : np.ndarray
            Sign of power production (-1 = extraction, +1 = injection).
            Sign of power production (1 = heat extraction, -1 = heat injection).
        T_fi : np.ndarray
            Inlet fluid temperature over time [°C].
        T_fo : np.ndarray
@@ -243,7 +243,7 @@ class SingleRunResult:
            Fluid temperature as function of time, depth and pipe index [°C].
            Shape: (n_time, n_depth_nodes, nPipes)
        qzb : np.ndarray
            Distributed heat flux at borehole wall [W/m].
            Distributed heat flux at borehole wall [W].
            Shape: (n_time, n_depth_segments)
        Re_in : np.ndarray
            Reynolds number in inlet pipes over time [-].
@@ -566,7 +566,7 @@ class SingleRun:
            - T_f : ndarray of shape (nt, npipes, nz)
                Fluid temperature in pipes [°C].
            - qzb : ndarray of shape (nt, nseg)
                Heat flux along the borehole wall [W/m].
                Heat flux along the borehole wall [W].
            - k_s : ndarray of shape (nseg,)
                Soil conductivity interpolated over segments.
            - k_g : ndarray of shape (nseg,)
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ units_dict = {
    "z": "m",
    "T_b": "\u00b0C",
    "T_f": "\u00b0C",
    "qzb": "W/m",
    "qzb": "W",
    "k_g": "W/mK",
    "k_p": "W/mK",
    "m_flow": "kg/s",
+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class B2G:
        T_f : ndarray
            Pipe fluid temperature field [°C].
        qzb : ndarray
            Vertical heat flux along borehole [W/m].
            Vertical heat flux along borehole [W].
        h_fpipes : ndarray
            Convective film coefficients for each pipe.
        result : ndarray
Loading