Skip to content

Commit 32c752b

Browse files
feat: removed ex_output
1 parent a3505bc commit 32c752b

File tree

4 files changed

+4
-80
lines changed

4 files changed

+4
-80
lines changed

examples/calc_jos3.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ def detailed_simulation():
7070
sex="male",
7171
bmr_equation="japanese",
7272
bsa_equation="fujimoto",
73-
ex_output="all",
7473
)
7574

7675
# Set environmental conditions such as air temperature, mean radiant temperature using the setter methods.

pythermalcomfort/jos3_functions/parameters.py

Lines changed: 3 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -80,360 +80,301 @@ class Default:
8080

8181

8282
ALL_OUT_PARAMS = {
83-
"age": {"ex_output": True, "meaning": "age", "suffix": None, "unit": "years"},
83+
"age": {"meaning": "age", "suffix": None, "unit": "years"},
8484
"bf_ava_foot": {
85-
"ex_output": True,
8685
"meaning": "AVA blood flow rate of one foot",
8786
"suffix": None,
8887
"unit": "L/h",
8988
},
9089
"bf_ava_hand": {
91-
"ex_output": True,
9290
"meaning": "AVA blood flow rate of one hand",
9391
"suffix": None,
9492
"unit": "L/h",
9593
},
9694
"bf_core": {
97-
"ex_output": True,
9895
"meaning": "core blood flow rate (each body part)",
9996
"suffix": "Body name",
10097
"unit": "L/h",
10198
},
10299
"bf_fat": {
103-
"ex_output": True,
104100
"meaning": "fat blood flow rate (each body part)",
105101
"suffix": "Body name",
106102
"unit": "L/h",
107103
},
108104
"bf_muscle": {
109-
"ex_output": True,
110105
"meaning": "muscle blood flow rate (each body part)",
111106
"suffix": "Body name",
112107
"unit": "L/h",
113108
},
114109
"bf_skin": {
115-
"ex_output": True,
116110
"meaning": "skin blood flow rate (each body part)",
117111
"suffix": "Body name",
118112
"unit": "L/h",
119113
},
120114
"bsa": {
121-
"ex_output": True,
122115
"meaning": "body surface area (each body part)",
123116
"suffix": "Body name",
124117
"unit": "m2",
125118
},
126119
"cardiac_output": {
127-
"ex_output": False,
128120
"meaning": "cardiac output (the sum of the whole blood flow)",
129121
"suffix": None,
130122
"unit": "L/h",
131123
},
132124
"e_max": {
133-
"ex_output": True,
134125
"meaning": "maximum evaporative heat loss from the skin (each body part)",
135126
"suffix": "Body name",
136127
"unit": "W",
137128
},
138129
"e_skin": {
139-
"ex_output": True,
140130
"meaning": "evaporative heat loss from the skin (each body part)",
141131
"suffix": "Body name",
142132
"unit": "W",
143133
},
144134
"e_sweat": {
145-
"ex_output": True,
146135
"meaning": (
147136
"evaporative heat loss from the skin by only sweating (each body part)"
148137
),
149138
"suffix": "Body name",
150139
"unit": "W",
151140
},
152-
"fat": {"ex_output": True, "meaning": "body fat rate", "suffix": None, "unit": "%"},
141+
"fat": {"meaning": "body fat rate", "suffix": None, "unit": "%"},
153142
"height": {
154-
"ex_output": True,
155143
"meaning": "body height",
156144
"suffix": None,
157145
"unit": "m",
158146
},
159147
"clo": {
160-
"ex_output": True,
161148
"meaning": "clothing insulation (each body part)",
162149
"suffix": "Body name",
163150
"unit": "clo",
164151
},
165152
"q_skin2env_latent": {
166-
"ex_output": True,
167153
"meaning": "latent heat loss from the skin (each body part)",
168154
"suffix": "Body name",
169155
"unit": "W",
170156
},
171157
"q_bmr_core": {
172-
"ex_output": True,
173158
"meaning": "core thermogenesis by basal metabolism (each body part)",
174159
"suffix": "Body name",
175160
"unit": "W",
176161
},
177162
"q_bmr_fat": {
178-
"ex_output": True,
179163
"meaning": "fat thermogenesis by basal metabolism (each body part)",
180164
"suffix": "Body name",
181165
"unit": "W",
182166
},
183167
"q_bmr_muscle": {
184-
"ex_output": True,
185168
"meaning": "muscle thermogenesis by basal metabolism (each body part)",
186169
"suffix": "Body name",
187170
"unit": "W",
188171
},
189172
"q_bmr_skin": {
190-
"ex_output": True,
191173
"meaning": "skin thermogenesis by basal metabolism (each body part)",
192174
"suffix": "Body name",
193175
"unit": "W",
194176
},
195177
"q_thermogenesis_total": {
196-
"ex_output": False,
197178
"meaning": "total thermogenesis of the whole body",
198179
"suffix": None,
199180
"unit": "W",
200181
},
201182
"q_nst": {
202-
"ex_output": True,
203183
"meaning": "core thermogenesis by non-shivering (each body part)",
204184
"suffix": "Body name",
205185
"unit": "W",
206186
},
207187
"simulation_time": {
208-
"ex_output": False,
209188
"meaning": "simulation times",
210189
"suffix": None,
211190
"unit": "sec",
212191
},
213192
"q_shiv": {
214-
"ex_output": True,
215193
"meaning": "core or muscle thermogenesis by shivering (each body part)",
216194
"suffix": "Body name",
217195
"unit": "W",
218196
},
219197
"q_work": {
220-
"ex_output": True,
221198
"meaning": "core or muscle thermogenesis by work (each body part)",
222199
"suffix": "Body name",
223200
"unit": "W",
224201
},
225202
"name": {
226-
"ex_output": True,
227203
"meaning": "name of the model",
228204
"suffix": None,
229205
"unit": "-",
230206
},
231207
"par": {
232-
"ex_output": True,
233208
"meaning": "physical activity ratio",
234209
"suffix": None,
235210
"unit": "-",
236211
},
237212
"q_thermogenesis_core": {
238-
"ex_output": True,
239213
"meaning": "core total thermogenesis (each body part)",
240214
"suffix": "Body name",
241215
"unit": "W",
242216
},
243217
"q_thermogenesis_fat": {
244-
"ex_output": True,
245218
"meaning": "fat total thermogenesis (each body part)",
246219
"suffix": "Body name",
247220
"unit": "W",
248221
},
249222
"q_thermogenesis_muscle": {
250-
"ex_output": True,
251223
"meaning": "muscle total thermogenesis (each body part)",
252224
"suffix": "Body name",
253225
"unit": "W",
254226
},
255227
"q_thermogenesis_skin": {
256-
"ex_output": True,
257228
"meaning": "skin total thermogenesis (each body part)",
258229
"suffix": "Body name",
259230
"unit": "W",
260231
},
261232
"q_res": {
262-
"ex_output": False,
263233
"meaning": "heat loss by respiration",
264234
"suffix": None,
265235
"unit": "W",
266236
},
267237
"q_res_latent": {
268-
"ex_output": True,
269238
"meaning": "latent heat loss by respiration (each body part)",
270239
"suffix": "Body name",
271240
"unit": "W",
272241
},
273242
"q_res_sensible": {
274-
"ex_output": True,
275243
"meaning": "sensible heat loss by respiration (each body part)",
276244
"suffix": "Body name",
277245
"unit": "W",
278246
},
279247
"rh": {
280-
"ex_output": True,
281248
"meaning": "relative humidity (each body part)",
282249
"suffix": "Body name",
283250
"unit": "%",
284251
},
285252
"r_et": {
286-
"ex_output": True,
287253
"meaning": "total clothing evaporative heat resistance (each body part)",
288254
"suffix": "Body name",
289255
"unit": "(m2*kPa)/W",
290256
},
291257
"r_t": {
292-
"ex_output": True,
293258
"meaning": "total clothing heat resistance (each body part)",
294259
"suffix": "Body name",
295260
"unit": "(m2*K)/W",
296261
},
297262
"q_skin2env_sensible": {
298-
"ex_output": True,
299263
"meaning": "sensible heat loss from the skin (each body part)",
300264
"suffix": "Body name",
301265
"unit": "W",
302266
},
303267
"t_skin_set": {
304-
"ex_output": True,
305268
"meaning": "skin set point temperature (each body part)",
306269
"suffix": "Body name",
307270
"unit": "°C",
308271
},
309272
"t_core_set": {
310-
"ex_output": True,
311273
"meaning": "core set point temperature (each body part)",
312274
"suffix": "Body name",
313275
"unit": "°C",
314276
},
315277
"sex": {
316-
"ex_output": True,
317278
"meaning": "sex",
318279
"suffix": None,
319280
"unit": "-",
320281
},
321282
"q_skin2env": {
322-
"ex_output": False,
323283
"meaning": "total heat loss from the skin (each body part)",
324284
"suffix": "Body name",
325285
"unit": "W",
326286
},
327287
"tdb": {
328-
"ex_output": True,
329288
"meaning": "dry bulb air temperature (each body part)",
330289
"suffix": "Body name",
331290
"unit": "°C",
332291
},
333292
"t_artery": {
334-
"ex_output": True,
335293
"meaning": "arterial temperature (each body part)",
336294
"suffix": "Body name",
337295
"unit": "°C",
338296
},
339297
"t_cb": {
340-
"ex_output": True,
341298
"meaning": "central blood temperature",
342299
"suffix": None,
343300
"unit": "°C",
344301
},
345302
"t_core": {
346-
"ex_output": False,
347303
"meaning": "core temperature (each body part)",
348304
"suffix": "Body name",
349305
"unit": "°C",
350306
},
351307
"t_fat": {
352-
"ex_output": True,
353308
"meaning": "fat temperature (each body part)",
354309
"suffix": "Body name",
355310
"unit": "°C",
356311
},
357312
"t_muscle": {
358-
"ex_output": True,
359313
"meaning": "muscle temperature (each body part)",
360314
"suffix": "Body name",
361315
"unit": "°C",
362316
},
363317
"to": {
364-
"ex_output": True,
365318
"meaning": "operative temperature (each body part)",
366319
"suffix": "Body name",
367320
"unit": "°C",
368321
},
369322
"tr": {
370-
"ex_output": True,
371323
"meaning": "mean radiant temperature (each body part)",
372324
"suffix": "Body name",
373325
"unit": "°C",
374326
},
375327
"t_skin": {
376-
"ex_output": False,
377328
"meaning": "skin temperature (each body part)",
378329
"suffix": "Body name",
379330
"unit": "°C",
380331
},
381332
"t_skin_mean": {
382-
"ex_output": False,
383333
"meaning": "mean skin temperature",
384334
"suffix": None,
385335
"unit": "°C",
386336
},
387337
"t_superficial_vein": {
388-
"ex_output": True,
389338
"meaning": "superficial vein temperature (each body part)",
390339
"suffix": "Body name",
391340
"unit": "°C",
392341
},
393342
"t_vein": {
394-
"ex_output": True,
395343
"meaning": "vein temperature (each body part)",
396344
"suffix": "Body name",
397345
"unit": "°C",
398346
},
399347
"v": {
400-
"ex_output": True,
401348
"meaning": "air velocity (each body part)",
402349
"suffix": "Body name",
403350
"unit": "m/s",
404351
},
405352
"weight": {
406-
"ex_output": True,
407353
"meaning": "body weight",
408354
"suffix": None,
409355
"unit": "kg",
410356
},
411357
"w": {
412-
"ex_output": False,
413358
"meaning": "skin wettedness (each body part)",
414359
"suffix": "Body name",
415360
"unit": "-",
416361
},
417362
"w_mean": {
418-
"ex_output": False,
419363
"meaning": "mean skin wettedness",
420364
"suffix": None,
421365
"unit": "-",
422366
},
423367
"weight_loss_by_evap_and_res": {
424-
"ex_output": False,
425368
"meaning": "weight loss by the evaporation and respiration of the whole body",
426369
"suffix": None,
427370
"unit": "g/sec",
428371
},
429372
"dt": {
430-
"ex_output": False,
431373
"meaning": "time step",
432374
"suffix": None,
433375
"unit": "sec",
434376
},
435377
"pythermalcomfort_version": {
436-
"ex_output": False,
437378
"meaning": "version of pythermalcomfort",
438379
"suffix": None,
439380
"unit": "-",
@@ -470,10 +411,7 @@ def show_out_param_docs():
470411

471412
line = "{}: {} [{}]".format(key.ljust(8), value["meaning"], value["unit"])
472413

473-
if value["ex_output"]:
474-
exoutparams += line + "\n"
475-
else:
476-
outparams += line + "\n"
414+
outparams += line + "\n"
477415

478416
docs = outparams + "\n" + exoutparams
479417
docs = textwrap.indent(docs.strip(), " ")

pythermalcomfort/models/atcs.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ def __init__(self, *args, **kwargs):
4949
Choose one from pythermalcomfort.utilities.BodySurfaceAreaEquations. Default is "dubois".
5050
The body surface area can be calculated using the function
5151
:py:meth:`pythermalcomfort.utilities.body_surface_area`.
52-
ex_output : None, list or "all", optional
53-
This is used when you want to display results other than the default output parameters (ex.skin temperature);
54-
by default, JOS outputs only the most necessary parameters in order to reduce the computational load.
55-
If the parameters other than the default output parameters are needed,
56-
specify the list of the desired parameter names in string format like ["bf_skin", "bf_core", "t_artery"].
57-
If you want to display all output results, set ex_output is "all".
5852
5953
Attributes
6054
----------

0 commit comments

Comments
 (0)