hestia-earth-models 0.44.5__py3-none-any.whl → 0.44.6__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of hestia-earth-models might be problematic. Click here for more details.
- hestia_earth/models/mocking/search-results.json +255 -174
- hestia_earth/models/pooreNemecek2018/excretaKgN.py +2 -2
- hestia_earth/models/pooreNemecek2018/excretaKgVs.py +2 -3
- hestia_earth/models/utils/term.py +19 -2
- hestia_earth/models/version.py +1 -1
- {hestia_earth_models-0.44.5.dist-info → hestia_earth_models-0.44.6.dist-info}/METADATA +1 -1
- {hestia_earth_models-0.44.5.dist-info → hestia_earth_models-0.44.6.dist-info}/RECORD +13 -13
- tests/models/pooreNemecek2018/test_excretaKgN.py +6 -6
- tests/models/pooreNemecek2018/test_excretaKgVs.py +3 -3
- tests/models/utils/test_term.py +11 -4
- {hestia_earth_models-0.44.5.dist-info → hestia_earth_models-0.44.6.dist-info}/LICENSE +0 -0
- {hestia_earth_models-0.44.5.dist-info → hestia_earth_models-0.44.6.dist-info}/WHEEL +0 -0
- {hestia_earth_models-0.44.5.dist-info → hestia_earth_models-0.44.6.dist-info}/top_level.txt +0 -0
|
@@ -34,18 +34,6 @@
|
|
|
34
34
|
"@type": "Term",
|
|
35
35
|
"@id": "dichlorodifluoromethaneToAirInputsProduction"
|
|
36
36
|
},
|
|
37
|
-
{
|
|
38
|
-
"@type": "Term",
|
|
39
|
-
"@id": "bromochlorodifluoromethaneToAirInputsProduction"
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
"@type": "Term",
|
|
43
|
-
"@id": "co2ToAirUreaHydrolysis"
|
|
44
|
-
},
|
|
45
|
-
{
|
|
46
|
-
"@type": "Term",
|
|
47
|
-
"@id": "noToAirExcreta"
|
|
48
|
-
},
|
|
49
37
|
{
|
|
50
38
|
"@type": "Term",
|
|
51
39
|
"@id": "nh3ToAirCropResidueDecomposition"
|
|
@@ -60,23 +48,23 @@
|
|
|
60
48
|
},
|
|
61
49
|
{
|
|
62
50
|
"@type": "Term",
|
|
63
|
-
"@id": "
|
|
51
|
+
"@id": "n2OToAirWasteTreatmentIndirect"
|
|
64
52
|
},
|
|
65
53
|
{
|
|
66
54
|
"@type": "Term",
|
|
67
|
-
"@id": "
|
|
55
|
+
"@id": "n2ToAirWasteTreatment"
|
|
68
56
|
},
|
|
69
57
|
{
|
|
70
58
|
"@type": "Term",
|
|
71
|
-
"@id": "
|
|
59
|
+
"@id": "noToAirInorganicFertiliser"
|
|
72
60
|
},
|
|
73
61
|
{
|
|
74
62
|
"@type": "Term",
|
|
75
|
-
"@id": "
|
|
63
|
+
"@id": "nh4ToGroundwaterExcreta"
|
|
76
64
|
},
|
|
77
65
|
{
|
|
78
66
|
"@type": "Term",
|
|
79
|
-
"@id": "
|
|
67
|
+
"@id": "bromochlorodifluoromethaneToAirInputsProduction"
|
|
80
68
|
},
|
|
81
69
|
{
|
|
82
70
|
"@type": "Term",
|
|
@@ -92,71 +80,67 @@
|
|
|
92
80
|
},
|
|
93
81
|
{
|
|
94
82
|
"@type": "Term",
|
|
95
|
-
"@id": "
|
|
96
|
-
},
|
|
97
|
-
{
|
|
98
|
-
"@type": "Term",
|
|
99
|
-
"@id": "n2OToAirCropResidueBurningIndirect"
|
|
83
|
+
"@id": "noToAirExcreta"
|
|
100
84
|
},
|
|
101
85
|
{
|
|
102
86
|
"@type": "Term",
|
|
103
|
-
"@id": "
|
|
87
|
+
"@id": "no3ToGroundwaterInorganicFertiliser"
|
|
104
88
|
},
|
|
105
89
|
{
|
|
106
90
|
"@type": "Term",
|
|
107
|
-
"@id": "
|
|
91
|
+
"@id": "co2ToAirUreaHydrolysis"
|
|
108
92
|
},
|
|
109
93
|
{
|
|
110
94
|
"@type": "Term",
|
|
111
|
-
"@id": "
|
|
95
|
+
"@id": "n2OToAirInputsProduction"
|
|
112
96
|
},
|
|
113
97
|
{
|
|
114
98
|
"@type": "Term",
|
|
115
|
-
"@id": "
|
|
99
|
+
"@id": "nmvocToAirSilageStorage"
|
|
116
100
|
},
|
|
117
101
|
{
|
|
118
102
|
"@type": "Term",
|
|
119
|
-
"@id": "
|
|
103
|
+
"@id": "n2OToAirCropResidueBurningIndirect"
|
|
120
104
|
},
|
|
121
105
|
{
|
|
122
106
|
"@type": "Term",
|
|
123
|
-
"@id": "
|
|
107
|
+
"@id": "nh4ToGroundwaterInorganicFertiliser"
|
|
124
108
|
},
|
|
125
109
|
{
|
|
126
110
|
"@type": "Term",
|
|
127
|
-
"@id": "
|
|
111
|
+
"@id": "ch4ToAirFuelCombustion"
|
|
128
112
|
},
|
|
129
113
|
{
|
|
130
114
|
"@type": "Term",
|
|
131
|
-
"@id": "
|
|
115
|
+
"@id": "nmvocToAirAnimalHousing"
|
|
132
116
|
},
|
|
133
117
|
{
|
|
134
118
|
"@type": "Term",
|
|
135
|
-
"@id": "
|
|
119
|
+
"@id": "nh3ToAirFuelCombustion"
|
|
136
120
|
},
|
|
137
121
|
{
|
|
138
122
|
"@type": "Term",
|
|
139
|
-
"@id": "
|
|
123
|
+
"@id": "po43ToSurfaceWaterInputsProduction"
|
|
140
124
|
},
|
|
141
125
|
{
|
|
142
126
|
"@type": "Term",
|
|
143
|
-
"@id": "
|
|
127
|
+
"@id": "noxToAirCropResidueDecomposition"
|
|
144
128
|
},
|
|
145
129
|
{
|
|
146
130
|
"@type": "Term",
|
|
147
|
-
"@id": "
|
|
131
|
+
"@id": "pToSurfaceWaterSoilFlux"
|
|
148
132
|
},
|
|
149
133
|
{
|
|
150
134
|
"@type": "Term",
|
|
151
|
-
"@id": "
|
|
135
|
+
"@id": "noToAirSoilFlux"
|
|
152
136
|
},
|
|
153
137
|
{
|
|
154
138
|
"@type": "Term",
|
|
155
|
-
"@id": "
|
|
139
|
+
"@id": "nh3ToAirInputsProduction"
|
|
156
140
|
},
|
|
157
141
|
{
|
|
158
142
|
"@type": "Term",
|
|
159
|
-
"@id": "
|
|
143
|
+
"@id": "pm25ToAirAnimalHousing"
|
|
160
144
|
},
|
|
161
145
|
{
|
|
162
146
|
"@type": "Term",
|
|
@@ -174,10 +158,6 @@
|
|
|
174
158
|
"@type": "Term",
|
|
175
159
|
"@id": "co2ToAirSoilFlux"
|
|
176
160
|
},
|
|
177
|
-
{
|
|
178
|
-
"@type": "Term",
|
|
179
|
-
"@id": "n2OToAirInputsProduction"
|
|
180
|
-
},
|
|
181
161
|
{
|
|
182
162
|
"@type": "Term",
|
|
183
163
|
"@id": "nh4ToGroundwaterOrganicFertiliser"
|
|
@@ -188,171 +168,167 @@
|
|
|
188
168
|
},
|
|
189
169
|
{
|
|
190
170
|
"@type": "Term",
|
|
191
|
-
"@id": "
|
|
192
|
-
},
|
|
193
|
-
{
|
|
194
|
-
"@type": "Term",
|
|
195
|
-
"@id": "noxToAirFuelCombustion"
|
|
171
|
+
"@id": "noxToAirOrganicSoilCultivation"
|
|
196
172
|
},
|
|
197
173
|
{
|
|
198
174
|
"@type": "Term",
|
|
199
|
-
"@id": "
|
|
175
|
+
"@id": "nToSurfaceWaterAquacultureSystems"
|
|
200
176
|
},
|
|
201
177
|
{
|
|
202
178
|
"@type": "Term",
|
|
203
|
-
"@id": "
|
|
179
|
+
"@id": "noxToAirFuelCombustion"
|
|
204
180
|
},
|
|
205
181
|
{
|
|
206
182
|
"@type": "Term",
|
|
207
|
-
"@id": "
|
|
183
|
+
"@id": "n2ToAirExcreta"
|
|
208
184
|
},
|
|
209
185
|
{
|
|
210
186
|
"@type": "Term",
|
|
211
|
-
"@id": "
|
|
187
|
+
"@id": "nmvocToAirExcreta"
|
|
212
188
|
},
|
|
213
189
|
{
|
|
214
190
|
"@type": "Term",
|
|
215
|
-
"@id": "
|
|
191
|
+
"@id": "noxToAirInorganicFertiliser"
|
|
216
192
|
},
|
|
217
193
|
{
|
|
218
194
|
"@type": "Term",
|
|
219
|
-
"@id": "
|
|
195
|
+
"@id": "n2OToAirExcretaDirect"
|
|
220
196
|
},
|
|
221
197
|
{
|
|
222
198
|
"@type": "Term",
|
|
223
|
-
"@id": "
|
|
199
|
+
"@id": "ch4ToAirWasteTreatment"
|
|
224
200
|
},
|
|
225
201
|
{
|
|
226
202
|
"@type": "Term",
|
|
227
|
-
"@id": "
|
|
203
|
+
"@id": "noToAirWasteTreatment"
|
|
228
204
|
},
|
|
229
205
|
{
|
|
230
206
|
"@type": "Term",
|
|
231
|
-
"@id": "
|
|
207
|
+
"@id": "n2OToAirFuelCombustionDirect"
|
|
232
208
|
},
|
|
233
209
|
{
|
|
234
210
|
"@type": "Term",
|
|
235
|
-
"@id": "
|
|
211
|
+
"@id": "n2ToAirOrganicFertiliser"
|
|
236
212
|
},
|
|
237
213
|
{
|
|
238
214
|
"@type": "Term",
|
|
239
|
-
"@id": "
|
|
215
|
+
"@id": "pToGroundwaterSoilFlux"
|
|
240
216
|
},
|
|
241
217
|
{
|
|
242
218
|
"@type": "Term",
|
|
243
|
-
"@id": "
|
|
219
|
+
"@id": "n2OToAirCropResidueDecompositionDirect"
|
|
244
220
|
},
|
|
245
221
|
{
|
|
246
222
|
"@type": "Term",
|
|
247
|
-
"@id": "
|
|
223
|
+
"@id": "co2ToAirNaturalVegetationBurning"
|
|
248
224
|
},
|
|
249
225
|
{
|
|
250
226
|
"@type": "Term",
|
|
251
|
-
"@id": "
|
|
227
|
+
"@id": "noToAirCropResidueBurning"
|
|
252
228
|
},
|
|
253
229
|
{
|
|
254
230
|
"@type": "Term",
|
|
255
|
-
"@id": "
|
|
231
|
+
"@id": "bod5ToWaterIndustrialProcesses"
|
|
256
232
|
},
|
|
257
233
|
{
|
|
258
234
|
"@type": "Term",
|
|
259
|
-
"@id": "
|
|
235
|
+
"@id": "n2OToAirCropResidueBurningDirect"
|
|
260
236
|
},
|
|
261
237
|
{
|
|
262
238
|
"@type": "Term",
|
|
263
|
-
"@id": "
|
|
239
|
+
"@id": "co2ToAirInputsProduction"
|
|
264
240
|
},
|
|
265
241
|
{
|
|
266
242
|
"@type": "Term",
|
|
267
|
-
"@id": "
|
|
243
|
+
"@id": "pToDrainageWaterInputsProduction"
|
|
268
244
|
},
|
|
269
245
|
{
|
|
270
246
|
"@type": "Term",
|
|
271
|
-
"@id": "
|
|
247
|
+
"@id": "n2OToAirOrganicSoilBurningDirect"
|
|
272
248
|
},
|
|
273
249
|
{
|
|
274
250
|
"@type": "Term",
|
|
275
|
-
"@id": "
|
|
251
|
+
"@id": "noxToAirWasteTreatment"
|
|
276
252
|
},
|
|
277
253
|
{
|
|
278
254
|
"@type": "Term",
|
|
279
|
-
"@id": "
|
|
255
|
+
"@id": "ch4ToAirOrganicSoilBurning"
|
|
280
256
|
},
|
|
281
257
|
{
|
|
282
258
|
"@type": "Term",
|
|
283
|
-
"@id": "
|
|
259
|
+
"@id": "po43ToGroundwaterOrganicFertiliser"
|
|
284
260
|
},
|
|
285
261
|
{
|
|
286
262
|
"@type": "Term",
|
|
287
|
-
"@id": "
|
|
263
|
+
"@id": "n2OToAirWasteTreatmentDirect"
|
|
288
264
|
},
|
|
289
265
|
{
|
|
290
266
|
"@type": "Term",
|
|
291
|
-
"@id": "
|
|
267
|
+
"@id": "pErosionInputsProduction"
|
|
292
268
|
},
|
|
293
269
|
{
|
|
294
270
|
"@type": "Term",
|
|
295
|
-
"@id": "
|
|
271
|
+
"@id": "nh4ToGroundwaterInputsProduction"
|
|
296
272
|
},
|
|
297
273
|
{
|
|
298
274
|
"@type": "Term",
|
|
299
|
-
"@id": "
|
|
275
|
+
"@id": "nh4ToGroundwaterCropResidueDecomposition"
|
|
300
276
|
},
|
|
301
277
|
{
|
|
302
278
|
"@type": "Term",
|
|
303
|
-
"@id": "
|
|
279
|
+
"@id": "nh3ToAirExcreta"
|
|
304
280
|
},
|
|
305
281
|
{
|
|
306
282
|
"@type": "Term",
|
|
307
|
-
"@id": "
|
|
283
|
+
"@id": "nErosionInputsProduction"
|
|
308
284
|
},
|
|
309
285
|
{
|
|
310
286
|
"@type": "Term",
|
|
311
|
-
"@id": "
|
|
287
|
+
"@id": "nh3ToAirInorganicFertiliser"
|
|
312
288
|
},
|
|
313
289
|
{
|
|
314
290
|
"@type": "Term",
|
|
315
|
-
"@id": "
|
|
291
|
+
"@id": "pToSurfaceWaterInputsProduction"
|
|
316
292
|
},
|
|
317
293
|
{
|
|
318
294
|
"@type": "Term",
|
|
319
|
-
"@id": "
|
|
295
|
+
"@id": "co2ToAirBelowGroundBiomassStockChange"
|
|
320
296
|
},
|
|
321
297
|
{
|
|
322
298
|
"@type": "Term",
|
|
323
|
-
"@id": "
|
|
299
|
+
"@id": "nh3ToAirAquacultureSystems"
|
|
324
300
|
},
|
|
325
301
|
{
|
|
326
302
|
"@type": "Term",
|
|
327
|
-
"@id": "
|
|
303
|
+
"@id": "n2OToAirFuelCombustionIndirect"
|
|
328
304
|
},
|
|
329
305
|
{
|
|
330
306
|
"@type": "Term",
|
|
331
|
-
"@id": "
|
|
307
|
+
"@id": "nmvocToAirInputsProduction"
|
|
332
308
|
},
|
|
333
309
|
{
|
|
334
310
|
"@type": "Term",
|
|
335
|
-
"@id": "
|
|
311
|
+
"@id": "nh3ToAirCropResidueBurning"
|
|
336
312
|
},
|
|
337
313
|
{
|
|
338
314
|
"@type": "Term",
|
|
339
|
-
"@id": "
|
|
315
|
+
"@id": "co2ToAirOrganicSoilBurning"
|
|
340
316
|
},
|
|
341
317
|
{
|
|
342
318
|
"@type": "Term",
|
|
343
|
-
"@id": "
|
|
319
|
+
"@id": "codToWaterInputsProduction"
|
|
344
320
|
},
|
|
345
321
|
{
|
|
346
322
|
"@type": "Term",
|
|
347
|
-
"@id": "
|
|
323
|
+
"@id": "po43ToGroundwaterSoilFlux"
|
|
348
324
|
},
|
|
349
325
|
{
|
|
350
326
|
"@type": "Term",
|
|
351
|
-
"@id": "
|
|
327
|
+
"@id": "noToAirCropResidueDecomposition"
|
|
352
328
|
},
|
|
353
329
|
{
|
|
354
330
|
"@type": "Term",
|
|
355
|
-
"@id": "
|
|
331
|
+
"@id": "co2ToAirLimeHydrolysis"
|
|
356
332
|
},
|
|
357
333
|
{
|
|
358
334
|
"@type": "Term",
|
|
@@ -380,7 +356,15 @@
|
|
|
380
356
|
},
|
|
381
357
|
{
|
|
382
358
|
"@type": "Term",
|
|
383
|
-
"@id": "
|
|
359
|
+
"@id": "n2OToAirAquacultureSystemsIndirect"
|
|
360
|
+
},
|
|
361
|
+
{
|
|
362
|
+
"@type": "Term",
|
|
363
|
+
"@id": "po43ToSurfaceWaterOrganicFertiliser"
|
|
364
|
+
},
|
|
365
|
+
{
|
|
366
|
+
"@type": "Term",
|
|
367
|
+
"@id": "n2OToAirOrganicFertiliserIndirect"
|
|
384
368
|
},
|
|
385
369
|
{
|
|
386
370
|
"@type": "Term",
|
|
@@ -404,175 +388,183 @@
|
|
|
404
388
|
},
|
|
405
389
|
{
|
|
406
390
|
"@type": "Term",
|
|
407
|
-
"@id": "
|
|
391
|
+
"@id": "ch4ToAirCropResidueBurning"
|
|
408
392
|
},
|
|
409
393
|
{
|
|
410
394
|
"@type": "Term",
|
|
411
|
-
"@id": "
|
|
395
|
+
"@id": "ch4ToAirNaturalVegetationBurning"
|
|
412
396
|
},
|
|
413
397
|
{
|
|
414
398
|
"@type": "Term",
|
|
415
|
-
"@id": "
|
|
399
|
+
"@id": "ch4ToAirSoilFlux"
|
|
416
400
|
},
|
|
417
401
|
{
|
|
418
402
|
"@type": "Term",
|
|
419
|
-
"@id": "
|
|
403
|
+
"@id": "nh3ToAirNaturalVegetationBurning"
|
|
420
404
|
},
|
|
421
405
|
{
|
|
422
406
|
"@type": "Term",
|
|
423
|
-
"@id": "
|
|
407
|
+
"@id": "n2OToAirOrganicSoilCultivationDirect"
|
|
424
408
|
},
|
|
425
409
|
{
|
|
426
410
|
"@type": "Term",
|
|
427
|
-
"@id": "
|
|
411
|
+
"@id": "1112TetrafluoroethaneToAirInputsProduction"
|
|
428
412
|
},
|
|
429
413
|
{
|
|
430
414
|
"@type": "Term",
|
|
431
|
-
"@id": "
|
|
415
|
+
"@id": "no3ToGroundwaterExcreta"
|
|
432
416
|
},
|
|
433
417
|
{
|
|
434
418
|
"@type": "Term",
|
|
435
|
-
"@id": "
|
|
419
|
+
"@id": "n2OToAirOrganicSoilBurningIndirect"
|
|
436
420
|
},
|
|
437
421
|
{
|
|
438
422
|
"@type": "Term",
|
|
439
|
-
"@id": "
|
|
423
|
+
"@id": "nmvocToAirFuelCombustion"
|
|
440
424
|
},
|
|
441
425
|
{
|
|
442
426
|
"@type": "Term",
|
|
443
|
-
"@id": "
|
|
427
|
+
"@id": "pm10ToAirFuelCombustion"
|
|
444
428
|
},
|
|
445
429
|
{
|
|
446
430
|
"@type": "Term",
|
|
447
|
-
"@id": "
|
|
431
|
+
"@id": "noxToAirCropResidueBurning"
|
|
448
432
|
},
|
|
449
433
|
{
|
|
450
434
|
"@type": "Term",
|
|
451
|
-
"@id": "
|
|
435
|
+
"@id": "nh3ToAirOrganicSoilBurning"
|
|
452
436
|
},
|
|
453
437
|
{
|
|
454
438
|
"@type": "Term",
|
|
455
|
-
"@id": "
|
|
439
|
+
"@id": "noToAirOrganicFertiliser"
|
|
456
440
|
},
|
|
457
441
|
{
|
|
458
442
|
"@type": "Term",
|
|
459
|
-
"@id": "
|
|
443
|
+
"@id": "no3ToSurfaceWaterIndustrialProcesses"
|
|
460
444
|
},
|
|
461
445
|
{
|
|
462
446
|
"@type": "Term",
|
|
463
|
-
"@id": "
|
|
447
|
+
"@id": "chlorodifluoromethaneToAirInputsProduction"
|
|
464
448
|
},
|
|
465
449
|
{
|
|
466
450
|
"@type": "Term",
|
|
467
|
-
"@id": "
|
|
451
|
+
"@id": "n2OToAirSoilFlux"
|
|
468
452
|
},
|
|
469
453
|
{
|
|
470
454
|
"@type": "Term",
|
|
471
|
-
"@id": "
|
|
455
|
+
"@id": "n2OToAirAquacultureSystemsDirect"
|
|
472
456
|
},
|
|
473
457
|
{
|
|
474
458
|
"@type": "Term",
|
|
475
|
-
"@id": "
|
|
459
|
+
"@id": "n2OToAirOrganicSoilCultivationIndirect"
|
|
476
460
|
},
|
|
477
461
|
{
|
|
478
462
|
"@type": "Term",
|
|
479
|
-
"@id": "
|
|
463
|
+
"@id": "nh4ToSurfaceWaterAquacultureSystems"
|
|
480
464
|
},
|
|
481
465
|
{
|
|
482
466
|
"@type": "Term",
|
|
483
|
-
"@id": "
|
|
467
|
+
"@id": "nToSurfaceWaterInputsProduction"
|
|
484
468
|
},
|
|
485
469
|
{
|
|
486
470
|
"@type": "Term",
|
|
487
|
-
"@id": "
|
|
471
|
+
"@id": "no3ToGroundwaterCropResidueDecomposition"
|
|
488
472
|
},
|
|
489
473
|
{
|
|
490
474
|
"@type": "Term",
|
|
491
|
-
"@id": "
|
|
475
|
+
"@id": "no3ToGroundwaterSoilFlux"
|
|
492
476
|
},
|
|
493
477
|
{
|
|
494
478
|
"@type": "Term",
|
|
495
|
-
"@id": "
|
|
479
|
+
"@id": "n2OToAirBackgroundSoilFluxDirect"
|
|
496
480
|
},
|
|
497
481
|
{
|
|
498
482
|
"@type": "Term",
|
|
499
|
-
"@id": "
|
|
483
|
+
"@id": "noxToAirOrganicFertiliser"
|
|
500
484
|
},
|
|
501
485
|
{
|
|
502
486
|
"@type": "Term",
|
|
503
|
-
"@id": "
|
|
487
|
+
"@id": "noxToAirNaturalVegetationBurning"
|
|
504
488
|
},
|
|
505
489
|
{
|
|
506
490
|
"@type": "Term",
|
|
507
|
-
"@id": "
|
|
491
|
+
"@id": "nErosionSoilFlux"
|
|
508
492
|
},
|
|
509
493
|
{
|
|
510
494
|
"@type": "Term",
|
|
511
|
-
"@id": "
|
|
495
|
+
"@id": "n2ToAirSoilFlux"
|
|
512
496
|
},
|
|
513
497
|
{
|
|
514
498
|
"@type": "Term",
|
|
515
|
-
"@id": "
|
|
499
|
+
"@id": "no3ToGroundwaterWasteTreatment"
|
|
516
500
|
},
|
|
517
501
|
{
|
|
518
502
|
"@type": "Term",
|
|
519
|
-
"@id": "
|
|
503
|
+
"@id": "co2ToAirSoilCarbonStockChange"
|
|
520
504
|
},
|
|
521
505
|
{
|
|
522
506
|
"@type": "Term",
|
|
523
|
-
"@id": "
|
|
507
|
+
"@id": "n2ToAirAquacultureSystems"
|
|
524
508
|
},
|
|
525
509
|
{
|
|
526
510
|
"@type": "Term",
|
|
527
|
-
"@id": "
|
|
511
|
+
"@id": "nh4ToGroundwaterWasteTreatment"
|
|
528
512
|
},
|
|
529
513
|
{
|
|
530
514
|
"@type": "Term",
|
|
531
|
-
"@id": "
|
|
515
|
+
"@id": "so2ToAirFuelCombustion"
|
|
532
516
|
},
|
|
533
517
|
{
|
|
534
518
|
"@type": "Term",
|
|
535
|
-
"@id": "
|
|
519
|
+
"@id": "ch4ToAirExcreta"
|
|
536
520
|
},
|
|
537
521
|
{
|
|
538
522
|
"@type": "Term",
|
|
539
|
-
"@id": "
|
|
523
|
+
"@id": "noxToAirAquacultureSystems"
|
|
540
524
|
},
|
|
541
525
|
{
|
|
542
526
|
"@type": "Term",
|
|
543
|
-
"@id": "
|
|
527
|
+
"@id": "n2ToAirCropResidueDecomposition"
|
|
544
528
|
},
|
|
545
529
|
{
|
|
546
530
|
"@type": "Term",
|
|
547
|
-
"@id": "
|
|
531
|
+
"@id": "nmvocToAirWasteTreatment"
|
|
548
532
|
},
|
|
549
533
|
{
|
|
550
534
|
"@type": "Term",
|
|
551
|
-
"@id": "
|
|
535
|
+
"@id": "pToGroundwaterInputsProduction"
|
|
552
536
|
},
|
|
553
537
|
{
|
|
554
538
|
"@type": "Term",
|
|
555
|
-
"@id": "
|
|
539
|
+
"@id": "ch4ToAirEntericFermentation"
|
|
556
540
|
},
|
|
557
541
|
{
|
|
558
542
|
"@type": "Term",
|
|
559
|
-
"@id": "
|
|
543
|
+
"@id": "nh3ToAirWasteTreatment"
|
|
560
544
|
},
|
|
561
545
|
{
|
|
562
546
|
"@type": "Term",
|
|
563
|
-
"@id": "
|
|
547
|
+
"@id": "no3ToGroundwaterOrganicFertiliser"
|
|
564
548
|
},
|
|
565
549
|
{
|
|
566
550
|
"@type": "Term",
|
|
567
|
-
"@id": "
|
|
551
|
+
"@id": "n2OToAirDiminishingSoilCarbonStocksDirect"
|
|
568
552
|
},
|
|
569
553
|
{
|
|
570
554
|
"@type": "Term",
|
|
571
|
-
"@id": "
|
|
555
|
+
"@id": "no3ToSurfaceWaterInputsProduction"
|
|
572
556
|
},
|
|
573
557
|
{
|
|
574
558
|
"@type": "Term",
|
|
575
|
-
"@id": "
|
|
559
|
+
"@id": "n2OToAirOrganicFertiliserDirect"
|
|
560
|
+
},
|
|
561
|
+
{
|
|
562
|
+
"@type": "Term",
|
|
563
|
+
"@id": "no3ToGroundwaterInputsProduction"
|
|
564
|
+
},
|
|
565
|
+
{
|
|
566
|
+
"@type": "Term",
|
|
567
|
+
"@id": "noxToAirOrganicSoilBurning"
|
|
576
568
|
},
|
|
577
569
|
{
|
|
578
570
|
"@type": "Term",
|
|
@@ -588,19 +580,23 @@
|
|
|
588
580
|
},
|
|
589
581
|
{
|
|
590
582
|
"@type": "Term",
|
|
591
|
-
"@id": "
|
|
583
|
+
"@id": "pToSurfaceWaterAquacultureSystems"
|
|
592
584
|
},
|
|
593
585
|
{
|
|
594
586
|
"@type": "Term",
|
|
595
|
-
"@id": "
|
|
587
|
+
"@id": "co2ToAirFuelCombustion"
|
|
596
588
|
},
|
|
597
589
|
{
|
|
598
590
|
"@type": "Term",
|
|
599
|
-
"@id": "
|
|
591
|
+
"@id": "pErosionSoilFlux"
|
|
600
592
|
},
|
|
601
593
|
{
|
|
602
594
|
"@type": "Term",
|
|
603
|
-
"@id": "
|
|
595
|
+
"@id": "nmvocToAirSilageFeeding"
|
|
596
|
+
},
|
|
597
|
+
{
|
|
598
|
+
"@type": "Term",
|
|
599
|
+
"@id": "ch4ToAirFloodedRice"
|
|
604
600
|
},
|
|
605
601
|
{
|
|
606
602
|
"@type": "Term",
|
|
@@ -608,63 +604,67 @@
|
|
|
608
604
|
},
|
|
609
605
|
{
|
|
610
606
|
"@type": "Term",
|
|
611
|
-
"@id": "
|
|
607
|
+
"@id": "hexaneToAirInputsProduction"
|
|
612
608
|
},
|
|
613
609
|
{
|
|
614
610
|
"@type": "Term",
|
|
615
|
-
"@id": "
|
|
611
|
+
"@id": "nh4ToSurfaceWaterInputsProduction"
|
|
616
612
|
},
|
|
617
613
|
{
|
|
618
614
|
"@type": "Term",
|
|
619
|
-
"@id": "
|
|
615
|
+
"@id": "ch4ToAirInputsProductionNonFossil"
|
|
620
616
|
},
|
|
621
617
|
{
|
|
622
618
|
"@type": "Term",
|
|
623
|
-
"@id": "
|
|
619
|
+
"@id": "pm10ToAirInputsProduction"
|
|
624
620
|
},
|
|
625
621
|
{
|
|
626
622
|
"@type": "Term",
|
|
627
|
-
"@id": "
|
|
623
|
+
"@id": "n2OToAirInorganicFertiliserDirect"
|
|
628
624
|
},
|
|
629
625
|
{
|
|
630
626
|
"@type": "Term",
|
|
631
|
-
"@id": "
|
|
627
|
+
"@id": "ch4ToAirInputsProductionFossil"
|
|
632
628
|
},
|
|
633
629
|
{
|
|
634
630
|
"@type": "Term",
|
|
635
|
-
"@id": "
|
|
631
|
+
"@id": "n2ToAirInorganicFertiliser"
|
|
636
632
|
},
|
|
637
633
|
{
|
|
638
634
|
"@type": "Term",
|
|
639
|
-
"@id": "
|
|
635
|
+
"@id": "co2ToAirOrganicSoilCultivation"
|
|
640
636
|
},
|
|
641
637
|
{
|
|
642
638
|
"@type": "Term",
|
|
643
|
-
"@id": "
|
|
639
|
+
"@id": "112TrichlorotrifluoroethaneToAirInputsProduction"
|
|
644
640
|
},
|
|
645
641
|
{
|
|
646
642
|
"@type": "Term",
|
|
647
|
-
"@id": "
|
|
643
|
+
"@id": "nh3ToAirOrganicFertiliser"
|
|
648
644
|
},
|
|
649
645
|
{
|
|
650
646
|
"@type": "Term",
|
|
651
|
-
"@id": "
|
|
647
|
+
"@id": "pm10ToAirAnimalHousing"
|
|
652
648
|
},
|
|
653
649
|
{
|
|
654
650
|
"@type": "Term",
|
|
655
|
-
"@id": "
|
|
651
|
+
"@id": "n2OToAirExcretaIndirect"
|
|
656
652
|
},
|
|
657
653
|
{
|
|
658
654
|
"@type": "Term",
|
|
659
|
-
"@id": "
|
|
655
|
+
"@id": "noxToAirExcreta"
|
|
660
656
|
},
|
|
661
657
|
{
|
|
662
658
|
"@type": "Term",
|
|
663
|
-
"@id": "
|
|
659
|
+
"@id": "po43ToSurfaceWaterAquacultureSystems"
|
|
664
660
|
},
|
|
665
661
|
{
|
|
666
662
|
"@type": "Term",
|
|
667
|
-
"@id": "
|
|
663
|
+
"@id": "nh4ToGroundwaterSoilFlux"
|
|
664
|
+
},
|
|
665
|
+
{
|
|
666
|
+
"@type": "Term",
|
|
667
|
+
"@id": "n2OToAirNaturalVegetationBurningIndirect"
|
|
668
668
|
}
|
|
669
669
|
]
|
|
670
670
|
},
|
|
@@ -689,7 +689,7 @@
|
|
|
689
689
|
"results": [
|
|
690
690
|
{
|
|
691
691
|
"@type": "Term",
|
|
692
|
-
"@id": "
|
|
692
|
+
"@id": "residueIncorporatedLessThan30DaysBeforeCultivation"
|
|
693
693
|
},
|
|
694
694
|
{
|
|
695
695
|
"@type": "Term",
|
|
@@ -697,19 +697,19 @@
|
|
|
697
697
|
},
|
|
698
698
|
{
|
|
699
699
|
"@type": "Term",
|
|
700
|
-
"@id": "
|
|
700
|
+
"@id": "residueRemoved"
|
|
701
701
|
},
|
|
702
702
|
{
|
|
703
703
|
"@type": "Term",
|
|
704
|
-
"@id": "
|
|
704
|
+
"@id": "residueBurntBeforeAllowingForCombustionFactor"
|
|
705
705
|
},
|
|
706
706
|
{
|
|
707
707
|
"@type": "Term",
|
|
708
|
-
"@id": "
|
|
708
|
+
"@id": "residueIncorporatedMoreThan30DaysBeforeCultivation"
|
|
709
709
|
},
|
|
710
710
|
{
|
|
711
711
|
"@type": "Term",
|
|
712
|
-
"@id": "
|
|
712
|
+
"@id": "residueLeftOnField"
|
|
713
713
|
},
|
|
714
714
|
{
|
|
715
715
|
"@type": "Term",
|
|
@@ -717,7 +717,7 @@
|
|
|
717
717
|
},
|
|
718
718
|
{
|
|
719
719
|
"@type": "Term",
|
|
720
|
-
"@id": "
|
|
720
|
+
"@id": "residueBurnt"
|
|
721
721
|
}
|
|
722
722
|
]
|
|
723
723
|
},
|
|
@@ -733,43 +733,43 @@
|
|
|
733
733
|
},
|
|
734
734
|
{
|
|
735
735
|
"@type": "Term",
|
|
736
|
-
"@id": "
|
|
736
|
+
"@id": "discardedCropLeftOnField"
|
|
737
737
|
},
|
|
738
738
|
{
|
|
739
739
|
"@type": "Term",
|
|
740
|
-
"@id": "
|
|
740
|
+
"@id": "discardedCropTotal"
|
|
741
741
|
},
|
|
742
742
|
{
|
|
743
743
|
"@type": "Term",
|
|
744
|
-
"@id": "
|
|
744
|
+
"@id": "discardedCropIncorporated"
|
|
745
745
|
},
|
|
746
746
|
{
|
|
747
747
|
"@type": "Term",
|
|
748
|
-
"@id": "
|
|
748
|
+
"@id": "aboveGroundCropResidueRemoved"
|
|
749
749
|
},
|
|
750
750
|
{
|
|
751
751
|
"@type": "Term",
|
|
752
|
-
"@id": "
|
|
752
|
+
"@id": "discardedCropRemoved"
|
|
753
753
|
},
|
|
754
754
|
{
|
|
755
755
|
"@type": "Term",
|
|
756
|
-
"@id": "
|
|
756
|
+
"@id": "aboveGroundCropResidueTotal"
|
|
757
757
|
},
|
|
758
758
|
{
|
|
759
759
|
"@type": "Term",
|
|
760
|
-
"@id": "
|
|
760
|
+
"@id": "aboveGroundCropResidueIncorporated"
|
|
761
761
|
},
|
|
762
762
|
{
|
|
763
763
|
"@type": "Term",
|
|
764
|
-
"@id": "
|
|
764
|
+
"@id": "aboveGroundCropResidueBurnt"
|
|
765
765
|
},
|
|
766
766
|
{
|
|
767
767
|
"@type": "Term",
|
|
768
|
-
"@id": "
|
|
768
|
+
"@id": "belowGroundCropResidue"
|
|
769
769
|
},
|
|
770
770
|
{
|
|
771
771
|
"@type": "Term",
|
|
772
|
-
"@id": "
|
|
772
|
+
"@id": "aboveGroundCropResidueLeftOnField"
|
|
773
773
|
}
|
|
774
774
|
]
|
|
775
775
|
},
|
|
@@ -802,7 +802,7 @@
|
|
|
802
802
|
"results": [
|
|
803
803
|
{
|
|
804
804
|
"@type": "Term",
|
|
805
|
-
"@id": "
|
|
805
|
+
"@id": "digestibleEnergyRuminants"
|
|
806
806
|
},
|
|
807
807
|
{
|
|
808
808
|
"@type": "Term",
|
|
@@ -818,15 +818,15 @@
|
|
|
818
818
|
},
|
|
819
819
|
{
|
|
820
820
|
"@type": "Term",
|
|
821
|
-
"@id": "
|
|
821
|
+
"@id": "digestibleEnergyPoultry"
|
|
822
822
|
},
|
|
823
823
|
{
|
|
824
824
|
"@type": "Term",
|
|
825
|
-
"@id": "
|
|
825
|
+
"@id": "digestibleEnergyAquaticSpecies"
|
|
826
826
|
},
|
|
827
827
|
{
|
|
828
828
|
"@type": "Term",
|
|
829
|
-
"@id": "
|
|
829
|
+
"@id": "digestibleEnergyOtherAnimals"
|
|
830
830
|
}
|
|
831
831
|
]
|
|
832
832
|
},
|
|
@@ -859,7 +859,7 @@
|
|
|
859
859
|
"results": [
|
|
860
860
|
{
|
|
861
861
|
"@type": "Term",
|
|
862
|
-
"@id": "
|
|
862
|
+
"@id": "energyDigestibilityPigs"
|
|
863
863
|
},
|
|
864
864
|
{
|
|
865
865
|
"@type": "Term",
|
|
@@ -875,20 +875,20 @@
|
|
|
875
875
|
},
|
|
876
876
|
{
|
|
877
877
|
"@type": "Term",
|
|
878
|
-
"@id": "
|
|
878
|
+
"@id": "energyDigestibilityPoultry"
|
|
879
879
|
},
|
|
880
880
|
{
|
|
881
881
|
"@type": "Term",
|
|
882
|
-
"@id": "
|
|
882
|
+
"@id": "energyDigestibilityAquaticSpecies"
|
|
883
883
|
},
|
|
884
884
|
{
|
|
885
885
|
"@type": "Term",
|
|
886
|
-
"@id": "
|
|
886
|
+
"@id": "energyDigestibilityOtherAnimals"
|
|
887
887
|
}
|
|
888
888
|
]
|
|
889
889
|
},
|
|
890
890
|
{
|
|
891
|
-
"name": "
|
|
891
|
+
"name": "get_excreta_N_terms",
|
|
892
892
|
"query": {
|
|
893
893
|
"termType.keyword": "excreta",
|
|
894
894
|
"units.keyword": "kg N"
|
|
@@ -968,6 +968,87 @@
|
|
|
968
968
|
}
|
|
969
969
|
]
|
|
970
970
|
},
|
|
971
|
+
{
|
|
972
|
+
"name": "get_excreta_VS_terms",
|
|
973
|
+
"query": {
|
|
974
|
+
"termType.keyword": "excreta",
|
|
975
|
+
"units.keyword": "kg VS"
|
|
976
|
+
},
|
|
977
|
+
"results": [
|
|
978
|
+
{
|
|
979
|
+
"@type": "Term",
|
|
980
|
+
"@id": "excretaSolidFishCrustaceansKgVs"
|
|
981
|
+
},
|
|
982
|
+
{
|
|
983
|
+
"@type": "Term",
|
|
984
|
+
"@id": "excretaDairyCattleKgVs"
|
|
985
|
+
},
|
|
986
|
+
{
|
|
987
|
+
"@type": "Term",
|
|
988
|
+
"@id": "excretaGeeseKgVs"
|
|
989
|
+
},
|
|
990
|
+
{
|
|
991
|
+
"@type": "Term",
|
|
992
|
+
"@id": "excretaSolidAndLiquidFishCrustaceansKgVs"
|
|
993
|
+
},
|
|
994
|
+
{
|
|
995
|
+
"@type": "Term",
|
|
996
|
+
"@id": "excretaLiquidFishCrustaceansKgVs"
|
|
997
|
+
},
|
|
998
|
+
{
|
|
999
|
+
"@type": "Term",
|
|
1000
|
+
"@id": "excretaCamelsKgVs"
|
|
1001
|
+
},
|
|
1002
|
+
{
|
|
1003
|
+
"@type": "Term",
|
|
1004
|
+
"@id": "excretaDucksKgVs"
|
|
1005
|
+
},
|
|
1006
|
+
{
|
|
1007
|
+
"@type": "Term",
|
|
1008
|
+
"@id": "excretaPigsKgVs"
|
|
1009
|
+
},
|
|
1010
|
+
{
|
|
1011
|
+
"@type": "Term",
|
|
1012
|
+
"@id": "excretaMixturesKgVs"
|
|
1013
|
+
},
|
|
1014
|
+
{
|
|
1015
|
+
"@type": "Term",
|
|
1016
|
+
"@id": "excretaPoultryKgVs"
|
|
1017
|
+
},
|
|
1018
|
+
{
|
|
1019
|
+
"@type": "Term",
|
|
1020
|
+
"@id": "excretaBeefCattleFeedlotFedKgVs"
|
|
1021
|
+
},
|
|
1022
|
+
{
|
|
1023
|
+
"@type": "Term",
|
|
1024
|
+
"@id": "excretaKgVs"
|
|
1025
|
+
},
|
|
1026
|
+
{
|
|
1027
|
+
"@type": "Term",
|
|
1028
|
+
"@id": "excretaBeefCattleExceptFeedlotFedKgVs"
|
|
1029
|
+
},
|
|
1030
|
+
{
|
|
1031
|
+
"@type": "Term",
|
|
1032
|
+
"@id": "processedExcretaKgVs"
|
|
1033
|
+
},
|
|
1034
|
+
{
|
|
1035
|
+
"@type": "Term",
|
|
1036
|
+
"@id": "excretaBuffaloKgVs"
|
|
1037
|
+
},
|
|
1038
|
+
{
|
|
1039
|
+
"@type": "Term",
|
|
1040
|
+
"@id": "excretaTurkeysKgVs"
|
|
1041
|
+
},
|
|
1042
|
+
{
|
|
1043
|
+
"@type": "Term",
|
|
1044
|
+
"@id": "excretaSheepAndGoatsKgVs"
|
|
1045
|
+
},
|
|
1046
|
+
{
|
|
1047
|
+
"@type": "Term",
|
|
1048
|
+
"@id": "excretaHorsesMulesAndAssesKgVs"
|
|
1049
|
+
}
|
|
1050
|
+
]
|
|
1051
|
+
},
|
|
971
1052
|
{
|
|
972
1053
|
"name": "get_generic_crop",
|
|
973
1054
|
"query": {
|
|
@@ -21,7 +21,7 @@ from hestia_earth.models.utils.term import get_lookup_value
|
|
|
21
21
|
from hestia_earth.models.utils.property import _get_nitrogen_content
|
|
22
22
|
from hestia_earth.models.utils.product import _new_product, animal_produced
|
|
23
23
|
from hestia_earth.models.utils.input import get_feed_nitrogen
|
|
24
|
-
from hestia_earth.models.utils.term import
|
|
24
|
+
from hestia_earth.models.utils.term import get_excreta_N_terms
|
|
25
25
|
from . import MODEL
|
|
26
26
|
|
|
27
27
|
REQUIREMENTS = {
|
|
@@ -81,7 +81,7 @@ def _run(term_id: str, mass_balance_items: list, alternate_items: list):
|
|
|
81
81
|
|
|
82
82
|
|
|
83
83
|
def _no_excreta_term(products: list):
|
|
84
|
-
term_ids =
|
|
84
|
+
term_ids = get_excreta_N_terms()
|
|
85
85
|
return all([not find_term_match(products, term) for term in term_ids])
|
|
86
86
|
|
|
87
87
|
|
|
@@ -15,12 +15,11 @@ from hestia_earth.utils.tools import list_sum, safe_parse_float
|
|
|
15
15
|
|
|
16
16
|
from hestia_earth.models.log import logRequirements, logShouldRun
|
|
17
17
|
from hestia_earth.models.utils.term import get_lookup_value
|
|
18
|
-
from hestia_earth.models.utils.constant import Units
|
|
19
18
|
from hestia_earth.models.utils.property import get_node_property
|
|
20
19
|
from hestia_earth.models.utils.product import _new_product
|
|
21
20
|
from hestia_earth.models.utils.input import get_feed_carbon
|
|
22
21
|
from hestia_earth.models.utils.measurement import most_relevant_measurement_value
|
|
23
|
-
from hestia_earth.models.utils.term import
|
|
22
|
+
from hestia_earth.models.utils.term import get_excreta_VS_terms
|
|
24
23
|
from . import MODEL
|
|
25
24
|
from .excretaKgN import _get_excreta_n_term
|
|
26
25
|
|
|
@@ -117,7 +116,7 @@ def _get_excreta_vs_term(product: dict):
|
|
|
117
116
|
|
|
118
117
|
|
|
119
118
|
def _no_excreta_term(products: list):
|
|
120
|
-
term_ids =
|
|
119
|
+
term_ids = get_excreta_VS_terms()
|
|
121
120
|
return all([not find_term_match(products, term) for term in term_ids])
|
|
122
121
|
|
|
123
122
|
|
|
@@ -142,7 +142,7 @@ def get_urea_terms():
|
|
|
142
142
|
return list(map(lambda n: n['@id'], terms))
|
|
143
143
|
|
|
144
144
|
|
|
145
|
-
def
|
|
145
|
+
def get_excreta_N_terms():
|
|
146
146
|
"""
|
|
147
147
|
Find all `excreta` terms in `kg N` from the Glossary:
|
|
148
148
|
https://hestia.earth/glossary?termType=excreta
|
|
@@ -154,7 +154,24 @@ def get_excreta_terms(units: Units = Units.KG_N):
|
|
|
154
154
|
"""
|
|
155
155
|
terms = find_node(SchemaType.TERM, {
|
|
156
156
|
'termType.keyword': TermTermType.EXCRETA.value,
|
|
157
|
-
'units.keyword':
|
|
157
|
+
'units.keyword': Units.KG_N.value
|
|
158
|
+
}, limit=LIMIT)
|
|
159
|
+
return list(map(lambda n: n['@id'], terms))
|
|
160
|
+
|
|
161
|
+
|
|
162
|
+
def get_excreta_VS_terms():
|
|
163
|
+
"""
|
|
164
|
+
Find all `excreta` terms in `kg Vs` from the Glossary:
|
|
165
|
+
https://hestia.earth/glossary?termType=excreta
|
|
166
|
+
|
|
167
|
+
Returns
|
|
168
|
+
-------
|
|
169
|
+
list
|
|
170
|
+
List of matching term `@id` as `str`.
|
|
171
|
+
"""
|
|
172
|
+
terms = find_node(SchemaType.TERM, {
|
|
173
|
+
'termType.keyword': TermTermType.EXCRETA.value,
|
|
174
|
+
'units.keyword': Units.KG_VS.value
|
|
158
175
|
}, limit=LIMIT)
|
|
159
176
|
return list(map(lambda n: n['@id'], terms))
|
|
160
177
|
|
hestia_earth/models/version.py
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
VERSION = '0.44.
|
|
1
|
+
VERSION = '0.44.6'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.1
|
|
2
2
|
Name: hestia-earth-models
|
|
3
|
-
Version: 0.44.
|
|
3
|
+
Version: 0.44.6
|
|
4
4
|
Summary: Hestia's set of modules for filling gaps in the activity data using external datasets (e.g. populating soil properties with a geospatial dataset using provided coordinates) and internal lookups (e.g. populating machinery use from fuel use). Includes rules for when gaps should be filled versus not (e.g. never gap fill yield, gap fill crop residue if yield provided etc.).
|
|
5
5
|
Home-page: https://gitlab.com/hestia-earth/hestia-engine-models
|
|
6
6
|
Author: Hestia Team
|
|
@@ -2,7 +2,7 @@ hestia_earth/__init__.py,sha256=G-d438vPx7m_ks5e9XTtM3u7LDRO5dSSukibukWmyPM,56
|
|
|
2
2
|
hestia_earth/models/__init__.py,sha256=qEFeq3yuf3lQKVseALmL8aPM8fpCS54B_5pry00M3hk,76
|
|
3
3
|
hestia_earth/models/log.py,sha256=rOgKa-gSrcS-Y1gO9eJXJaA3ofxcQW_45hGly2Lf00Y,2444
|
|
4
4
|
hestia_earth/models/requirements.py,sha256=znNZJAhwX2iYiKcAQXPftY7z_1MsNa0QxCXkXyHm_U0,17363
|
|
5
|
-
hestia_earth/models/version.py,sha256=
|
|
5
|
+
hestia_earth/models/version.py,sha256=taeVh2_WgbOJy1VoS9mf7Yd35BQxdqpZcIFdshvWnD0,19
|
|
6
6
|
hestia_earth/models/agribalyse2016/__init__.py,sha256=WvK0qCQbnYtg9oZxrACd1wGormZyXibPtpCnIQeDqbw,415
|
|
7
7
|
hestia_earth/models/agribalyse2016/fuelElectricity.py,sha256=ztMnY6XTwsJD-lp62jJyzN2AUODvFHIs5d5CaFrlVGI,3567
|
|
8
8
|
hestia_earth/models/agribalyse2016/machineryInfrastructureDepreciatedAmountPerCycle.py,sha256=10XV1fz_yBYlqmNJ3cxmT2I2Vp_0w7nT4zMIuBw2wCY,3294
|
|
@@ -315,13 +315,13 @@ hestia_earth/models/lcImpactCertainEffectsInfinite/damageToTerrestrialEcosystems
|
|
|
315
315
|
hestia_earth/models/linkedImpactAssessment/__init__.py,sha256=x6xsPu-Rwh-7HKsvHuKmgM1YML6fQy2z9Hsy9_BeO2Y,3565
|
|
316
316
|
hestia_earth/models/mocking/__init__.py,sha256=Y39V6yj_3M1q8v9ShCHwPeJOstypOVIvb_FldMEbF7g,766
|
|
317
317
|
hestia_earth/models/mocking/mock_search.py,sha256=ysPhzvMGvsHKqQXKRFi8ZqohcnyKutBlNqT_j0OH8L4,1983
|
|
318
|
-
hestia_earth/models/mocking/search-results.json,sha256=
|
|
318
|
+
hestia_earth/models/mocking/search-results.json,sha256=2OtWvfsZjgMVDQHmlMUHZMcsjIu6IaBub8vz492JnQ4,29411
|
|
319
319
|
hestia_earth/models/pooreNemecek2018/__init__.py,sha256=nPboL7ULJzL5nJD5q7q9VOZt_fxbKVm8fmn1Az5YkVY,417
|
|
320
320
|
hestia_earth/models/pooreNemecek2018/aboveGroundCropResidueTotal.py,sha256=trQBxjc8V77q96sxvK4Y9HfpD64zgyGuB5o5_o0lHts,2189
|
|
321
321
|
hestia_earth/models/pooreNemecek2018/belowGroundCropResidue.py,sha256=do9zHHR8VuqFcWNLnql5t3tV478SCVc7tC3mEs5cdUk,2184
|
|
322
322
|
hestia_earth/models/pooreNemecek2018/ch4ToAirAquacultureSystems.py,sha256=iPNQCPSF0oXzmR7KQqgySpeQAkPFgmBhbta6m6t6Y2U,6603
|
|
323
|
-
hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=
|
|
324
|
-
hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=
|
|
323
|
+
hestia_earth/models/pooreNemecek2018/excretaKgN.py,sha256=vgjxJP-KXmUujVerDtbLvDNGiqouFK4DgOiLPbSSPh4,5681
|
|
324
|
+
hestia_earth/models/pooreNemecek2018/excretaKgVs.py,sha256=FAZDTyC-5tsqtFlfBPSdFaB6QeASwKIOc7d6_TT_eNQ,7693
|
|
325
325
|
hestia_earth/models/pooreNemecek2018/landOccupationDuringCycle.py,sha256=Zlq4gfVPrneqTaahtUiEtmjNqct75AoIag33gOZbC3E,2820
|
|
326
326
|
hestia_earth/models/pooreNemecek2018/longFallowPeriod.py,sha256=RHrkBR-U2VSGpwPBs9RCWVlZtHin5BXESKE9jienrRw,1374
|
|
327
327
|
hestia_earth/models/pooreNemecek2018/n2OToAirAquacultureSystemsDirect.py,sha256=BgxKSBSRdyNU1_q8Vf9GULkIewuXKmgfDQU9Thzxc1g,2724
|
|
@@ -472,7 +472,7 @@ hestia_earth/models/utils/productivity.py,sha256=bUBVCZInGqHuHZvHDSYPQkjWXQxOtTj
|
|
|
472
472
|
hestia_earth/models/utils/property.py,sha256=X4DDQKHEVYqtW6nNxBhLZ40_avix2dLDxR22Ipeq0TA,4274
|
|
473
473
|
hestia_earth/models/utils/site.py,sha256=RZHcftsauPtvC7ma6ea31m3tIjyAR_VRBTcvYAC9v7s,2153
|
|
474
474
|
hestia_earth/models/utils/temperature.py,sha256=ljlG4-yCgFFb6LRZweb18cZKLrr7K2mqd4E4Hz_D1f8,476
|
|
475
|
-
hestia_earth/models/utils/term.py,sha256=
|
|
475
|
+
hestia_earth/models/utils/term.py,sha256=Es4AMaD-sFL9-FxTDB9OSLd-xno-ZMHSorDKsUzTr2E,12095
|
|
476
476
|
hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=Niv7ZFMBCwThlbCKGOwA17QdkpOUDFrqrFItGNqnZAA,434
|
|
477
477
|
hestia_earth/models/webbEtAl2012AndSintermannEtAl2012/nh3ToAirOrganicFertiliser.py,sha256=fcqomqaWp4BNh937FdC5M-WrhBovtoH-pdUlCnkz7TU,4061
|
|
478
478
|
tests/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
@@ -780,8 +780,8 @@ tests/models/pooreNemecek2018/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
|
|
|
780
780
|
tests/models/pooreNemecek2018/test_aboveGroundCropResidueTotal.py,sha256=m-cpFULarm0Ee4MV-OvhYPRg7W2_mvbrqHkjDZgcQsw,1660
|
|
781
781
|
tests/models/pooreNemecek2018/test_belowGroundCropResidue.py,sha256=A6EOD2B6frN0UtuUTP3GwZ7bNEtEudQfztHXjdiDwdQ,1655
|
|
782
782
|
tests/models/pooreNemecek2018/test_ch4ToAirAquacultureSystems.py,sha256=rUxD57yl82Ht8IyhbiQhi0xl8L9iLdnLpbI-T5C0Mck,2722
|
|
783
|
-
tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=
|
|
784
|
-
tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=
|
|
783
|
+
tests/models/pooreNemecek2018/test_excretaKgN.py,sha256=WZViYAz9A7UwDrmVx4y7SYRFuLxdxJIdkQSxvXmzbhM,4016
|
|
784
|
+
tests/models/pooreNemecek2018/test_excretaKgVs.py,sha256=2D3V4uLWFKdhdpFlr7gjb6Cli3tqBNcy0CXjIcPJ4x0,2707
|
|
785
785
|
tests/models/pooreNemecek2018/test_landOccupationDuringCycle.py,sha256=PZ56Xqv6xHgjCpmDK1CTxGzLjaD8rzZ1RO-TopZNF3o,1652
|
|
786
786
|
tests/models/pooreNemecek2018/test_longFallowPeriod.py,sha256=PuwIFqZs2yn4jg9mx4Lk7Z227KAbU5IoV5CiGUV8mpA,925
|
|
787
787
|
tests/models/pooreNemecek2018/test_n2OToAirAquacultureSystemsDirect.py,sha256=4YAoUhIwfEmRe2B5BvNg247VeB7UXHNeZqr2mRtJA7Y,2207
|
|
@@ -918,11 +918,11 @@ tests/models/utils/test_practice.py,sha256=ILaxkb3qICor9AquAGYiOtA-YKnq0hppmJQzN
|
|
|
918
918
|
tests/models/utils/test_product.py,sha256=heyd7zYUXaqiiPgBkWJr-OxMNcdVzC8jSRCfvMt4CQE,1726
|
|
919
919
|
tests/models/utils/test_property.py,sha256=t2npw86IK7C6G4ypiPtanFi0db4PB7G5VBR1GjRGl34,618
|
|
920
920
|
tests/models/utils/test_site.py,sha256=deEIYptl2MHEklSfHbZV9qA59YKqZLQr8y5rWYiD460,680
|
|
921
|
-
tests/models/utils/test_term.py,sha256
|
|
921
|
+
tests/models/utils/test_term.py,sha256=-Wn2C1jyOLfkvhcKmKWT-Jms7yqLwx5ok91gYJNcGWc,2028
|
|
922
922
|
tests/models/webbEtAl2012AndSintermannEtAl2012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
923
923
|
tests/models/webbEtAl2012AndSintermannEtAl2012/test_nh3ToAirOrganicFertiliser.py,sha256=qi2FNXS5Af2WDtm7nq_FsprH3BfCF0XxnE0XHmC4aIY,2244
|
|
924
|
-
hestia_earth_models-0.44.
|
|
925
|
-
hestia_earth_models-0.44.
|
|
926
|
-
hestia_earth_models-0.44.
|
|
927
|
-
hestia_earth_models-0.44.
|
|
928
|
-
hestia_earth_models-0.44.
|
|
924
|
+
hestia_earth_models-0.44.6.dist-info/LICENSE,sha256=EFSZhfUdZCTsCIYdHzTGewMKfRfp7X9t1s2aaKxm8O0,1154
|
|
925
|
+
hestia_earth_models-0.44.6.dist-info/METADATA,sha256=sZ1RfX1WGhbTlTP_40S7dwt1QBruRa52MSpOWiZmD-w,3192
|
|
926
|
+
hestia_earth_models-0.44.6.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
|
|
927
|
+
hestia_earth_models-0.44.6.dist-info/top_level.txt,sha256=1dqA9TqpOLTEgpqa-YBsmbCmmNU1y56AtfFGEceZ2A0,19
|
|
928
|
+
hestia_earth_models-0.44.6.dist-info/RECORD,,
|
|
@@ -9,7 +9,7 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgN"
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
@patch(f"{class_path}._get_nitrogen_content", return_value=10)
|
|
12
|
-
@patch(f"{class_path}.
|
|
12
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
13
13
|
@patch(f"{class_path}.get_feed_nitrogen", return_value=0)
|
|
14
14
|
@patch(f"{class_path}.animal_produced", return_value=0)
|
|
15
15
|
@patch(f"{class_path}._get_excreta_n_term", return_value='excretaKgN')
|
|
@@ -59,7 +59,7 @@ def test_should_run(mock_get_excreta_term, mock_animal_produced, mock_get_feed,
|
|
|
59
59
|
assert not should_run
|
|
60
60
|
|
|
61
61
|
|
|
62
|
-
@patch(f"{class_path}.
|
|
62
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
63
63
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
64
64
|
def test_run(*args):
|
|
65
65
|
with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -72,7 +72,7 @@ def test_run(*args):
|
|
|
72
72
|
assert value == expected
|
|
73
73
|
|
|
74
74
|
|
|
75
|
-
@patch(f"{class_path}.
|
|
75
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
76
76
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
77
77
|
def test_run_with_liveweight(*args):
|
|
78
78
|
with open(f"{fixtures_folder}/with-liveweight/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -85,7 +85,7 @@ def test_run_with_liveweight(*args):
|
|
|
85
85
|
assert value == expected
|
|
86
86
|
|
|
87
87
|
|
|
88
|
-
@patch(f"{class_path}.
|
|
88
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
89
89
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
90
90
|
def test_run_with_carcass(*args):
|
|
91
91
|
with open(f"{fixtures_folder}/with-carcass/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -98,7 +98,7 @@ def test_run_with_carcass(*args):
|
|
|
98
98
|
assert value == expected
|
|
99
99
|
|
|
100
100
|
|
|
101
|
-
@patch(f"{class_path}.
|
|
101
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
102
102
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
103
103
|
def test_run_with_head(*args):
|
|
104
104
|
with open(f"{fixtures_folder}/with-head/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -111,7 +111,7 @@ def test_run_with_head(*args):
|
|
|
111
111
|
assert value == expected
|
|
112
112
|
|
|
113
113
|
|
|
114
|
-
@patch(f"{class_path}.
|
|
114
|
+
@patch(f"{class_path}.get_excreta_N_terms", return_value=[])
|
|
115
115
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
116
116
|
def test_run_with_liveAquaticSpecies(*args):
|
|
117
117
|
with open(f"{fixtures_folder}/with-liveAquaticSpecies/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -9,7 +9,7 @@ fixtures_folder = f"{fixtures_path}/{MODEL}/excretaKgVs"
|
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
@patch(f"{class_path}._get_excreta_n_term", return_value='')
|
|
12
|
-
@patch(f"{class_path}.
|
|
12
|
+
@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
|
|
13
13
|
@patch(f"{class_path}.get_feed_carbon", return_value=5)
|
|
14
14
|
@patch(f"{class_path}._get_carbonContent", return_value=5)
|
|
15
15
|
@patch(f"{class_path}._get_conv_aq_ocsed", return_value=0.35)
|
|
@@ -63,7 +63,7 @@ def test_should_run(*args):
|
|
|
63
63
|
assert should_run is True
|
|
64
64
|
|
|
65
65
|
|
|
66
|
-
@patch(f"{class_path}.
|
|
66
|
+
@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
|
|
67
67
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
68
68
|
def test_run(*args):
|
|
69
69
|
with open(f"{fixtures_folder}/cycle.jsonld", encoding='utf-8') as f:
|
|
@@ -76,7 +76,7 @@ def test_run(*args):
|
|
|
76
76
|
assert value == expected
|
|
77
77
|
|
|
78
78
|
|
|
79
|
-
@patch(f"{class_path}.
|
|
79
|
+
@patch(f"{class_path}.get_excreta_VS_terms", return_value=[])
|
|
80
80
|
@patch(f"{class_path}._new_product", side_effect=fake_new_product)
|
|
81
81
|
def test_run_excretaKgN(*args):
|
|
82
82
|
with open(f"{fixtures_folder}/with-excretaKgN/cycle.jsonld", encoding='utf-8') as f:
|
tests/models/utils/test_term.py
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
from unittest.mock import patch
|
|
2
2
|
|
|
3
3
|
from hestia_earth.models.utils.term import (
|
|
4
|
-
get_liquid_fuel_terms, get_irrigation_terms, get_urea_terms,
|
|
5
|
-
get_rice_paddy_terms, get_tillage_terms, get_crop_residue_terms
|
|
4
|
+
get_liquid_fuel_terms, get_irrigation_terms, get_urea_terms, get_excreta_N_terms, get_excreta_VS_terms,
|
|
5
|
+
get_generic_crop, get_rice_paddy_terms, get_tillage_terms, get_crop_residue_terms
|
|
6
6
|
)
|
|
7
7
|
|
|
8
8
|
class_path = 'hestia_earth.models.utils.term'
|
|
@@ -30,10 +30,17 @@ def test_get_urea_terms(mock_find_node):
|
|
|
30
30
|
|
|
31
31
|
|
|
32
32
|
@patch(f"{class_path}.find_node")
|
|
33
|
-
def
|
|
33
|
+
def test_get_excreta_N_terms(mock_find_node):
|
|
34
34
|
id = 'term-id'
|
|
35
35
|
mock_find_node.return_value = [{'@id': id}]
|
|
36
|
-
assert
|
|
36
|
+
assert get_excreta_N_terms() == [id]
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
@patch(f"{class_path}.find_node")
|
|
40
|
+
def test_get_excreta_VS_terms(mock_find_node):
|
|
41
|
+
id = 'term-id'
|
|
42
|
+
mock_find_node.return_value = [{'@id': id}]
|
|
43
|
+
assert get_excreta_VS_terms() == [id]
|
|
37
44
|
|
|
38
45
|
|
|
39
46
|
@patch(f"{class_path}.find_node")
|
|
File without changes
|
|
File without changes
|
|
File without changes
|