Skip to content

Commit eee6447

Browse files
gnrgomesgnrgomes
committed
Remove of tss files processing
1 parent 1941fa9 commit eee6447

12 files changed

+4
-294
lines changed

‎settings_tpl.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -419,39 +419,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
419419

420420
</group>
421421

422-
<group>
423-
<comment>
424-
**************************************************************
425-
REPORTED OUTPUT TIME SERIES
426-
**************************************************************
427-
</comment>
428-
429-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
430-
<comment>
431-
Average temperature [deg C]
432-
</comment>
433-
</textvar>
434-
435-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
436-
<comment>
437-
Potential reference evapotranspiration rate [mm/day]
438-
</comment>
439-
</textvar>
440-
441-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
442-
<comment>
443-
Potential evaporation rate of a free water surface [mm/day]
444-
</comment>
445-
</textvar>
446-
447-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
448-
<comment>
449-
Potential evaporation rate from a bare soil surface [mm/day]
450-
</comment>
451-
</textvar>
452-
453-
</group>
454-
455422
<group>
456423
<comment>
457424
**************************************************************

‎settings_tpl.yaml‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -167,16 +167,6 @@ output-maps:
167167
# daily reference evapotranspiration (crop) [mm/day]
168168
ET0Maps: $(PathOut)/$(PrefixET0)
169169

170-
reported-output-timeseries:
171-
# Average temperature [deg C]
172-
TAvgTS: $(PathOut)/tAvg.tss
173-
# Potential reference evapotranspiration rate [mm/day]
174-
ET0TS: $(PathOut)/et0.tss
175-
# Potential evaporation rate of a free water surface [mm/day]
176-
E0TS: $(PathOut)/e0.tss
177-
# Potential evaporation rate from a bare soil surface [mm/day]
178-
ES0TS: $(PathOut)/es0.tss
179-
180170
input-base-maps:
181171
# Clone map
182172
MaskMap: $(PathMeteoIn)/areaall.nc

‎src/lisvap/utils/__init__.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@ def _reported_maps(self):
204204
@staticmethod
205205
def config_flags():
206206
""" read flags - according to the flags the output is adjusted
207-
quiet, veryquiet, loud, checkfiles, noheader, printtime
207+
quiet, veryquiet, loud, checkfiles, printtime
208208
"""
209209
flags = {'quiet': False, 'veryquiet': False, 'loud': False,
210-
'checkfiles': False, 'noheader': False, 'printtime': False}
210+
'checkfiles': False, 'printtime': False}
211211

212212
@cached
213213
def _flags(argz):
@@ -221,7 +221,7 @@ def _flags(argz):
221221
for o, a in opts:
222222
for opt in (('-q', '--quiet'), ('-v', '--veryquiet'),
223223
('-l', '--loud'), ('-c', '--checkfiles'),
224-
('-h', '--noheader'), ('-t', '--printtime')):
224+
('-t', '--printtime')):
225225
if o in opt:
226226
flags[opt[1].lstrip('--')] = True
227227
break
@@ -793,7 +793,6 @@ def usage():
793793
-v --veryquiet no output progression is given
794794
-l --loud output progression given as time step, date and discharge
795795
-c --checkfiles input maps and stack maps are checked, output for each input map BUT no model run
796-
-h --noheader .tss file have no header and start immediately with the time series
797796
-t --printtime the computation time for hydrological modules are printed\n
798797
""".format(version=__version__, date=__date__, status=__status__, authors=__authors__, maintainers=__maintainers__)
799798
)

‎src/lisvap/utils/output.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class OutputMap(object):
2929

3030
"""
3131
# ************************************************************
32-
# ***** Output of time series (.tss) and maps*****************
32+
# ***** Output of time series maps ***************************
3333
# ************************************************************
3434
"""
3535

‎tests/data/tests_cordex.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -455,39 +455,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
455455

456456
</group>
457457

458-
<group>
459-
<comment>
460-
**************************************************************
461-
REPORTED OUTPUT TIME SERIES
462-
**************************************************************
463-
</comment>
464-
465-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
466-
<comment>
467-
Average temperature [deg C]
468-
</comment>
469-
</textvar>
470-
471-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
472-
<comment>
473-
Potential reference evapotranspiration rate [mm/day]
474-
</comment>
475-
</textvar>
476-
477-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
478-
<comment>
479-
Potential evaporation rate of a free water surface [mm/day]
480-
</comment>
481-
</textvar>
482-
483-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
484-
<comment>
485-
Potential evaporation rate from a bare soil surface [mm/day]
486-
</comment>
487-
</textvar>
488-
489-
</group>
490-
491458
<group>
492459
<comment>
493460
**************************************************************

‎tests/data/tests_efas.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -389,39 +389,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
389389

390390
</group>
391391

392-
<group>
393-
<comment>
394-
**************************************************************
395-
REPORTED OUTPUT TIME SERIES
396-
**************************************************************
397-
</comment>
398-
399-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
400-
<comment>
401-
Average temperature [deg C]
402-
</comment>
403-
</textvar>
404-
405-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
406-
<comment>
407-
Potential reference evapotranspiration rate [mm/day]
408-
</comment>
409-
</textvar>
410-
411-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
412-
<comment>
413-
Potential evaporation rate of a free water surface [mm/day]
414-
</comment>
415-
</textvar>
416-
417-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
418-
<comment>
419-
Potential evaporation rate from a bare soil surface [mm/day]
420-
</comment>
421-
</textvar>
422-
423-
</group>
424-
425392
<group>
426393
<comment>
427394
**************************************************************

‎tests/data/tests_efas_1arcmin.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
388388

389389
</group>
390390

391-
<group>
392-
<comment>
393-
**************************************************************
394-
REPORTED OUTPUT TIME SERIES
395-
**************************************************************
396-
</comment>
397-
398-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
399-
<comment>
400-
Average temperature [deg C]
401-
</comment>
402-
</textvar>
403-
404-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
405-
<comment>
406-
Potential reference evapotranspiration rate [mm/day]
407-
</comment>
408-
</textvar>
409-
410-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
411-
<comment>
412-
Potential evaporation rate of a free water surface [mm/day]
413-
</comment>
414-
</textvar>
415-
416-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
417-
<comment>
418-
Potential evaporation rate from a bare soil surface [mm/day]
419-
</comment>
420-
</textvar>
421-
422-
</group>
423-
424391
<group>
425392
<comment>
426393
**************************************************************

‎tests/data/tests_efas_1arcmin_6hourly.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
388388

389389
</group>
390390

391-
<group>
392-
<comment>
393-
**************************************************************
394-
REPORTED OUTPUT TIME SERIES
395-
**************************************************************
396-
</comment>
397-
398-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
399-
<comment>
400-
Average temperature [deg C]
401-
</comment>
402-
</textvar>
403-
404-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
405-
<comment>
406-
Potential reference evapotranspiration rate [mm/hour]
407-
</comment>
408-
</textvar>
409-
410-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
411-
<comment>
412-
Potential evaporation rate of a free water surface [mm/hour]
413-
</comment>
414-
</textvar>
415-
416-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
417-
<comment>
418-
Potential evaporation rate from a bare soil surface [mm/hour]
419-
</comment>
420-
</textvar>
421-
422-
</group>
423-
424391
<group>
425392
<comment>
426393
**************************************************************

‎tests/data/tests_efas_1arcmin_hourly.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
388388

389389
</group>
390390

391-
<group>
392-
<comment>
393-
**************************************************************
394-
REPORTED OUTPUT TIME SERIES
395-
**************************************************************
396-
</comment>
397-
398-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
399-
<comment>
400-
Average temperature [deg C]
401-
</comment>
402-
</textvar>
403-
404-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
405-
<comment>
406-
Potential reference evapotranspiration rate [mm/hour]
407-
</comment>
408-
</textvar>
409-
410-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
411-
<comment>
412-
Potential evaporation rate of a free water surface [mm/hour]
413-
</comment>
414-
</textvar>
415-
416-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
417-
<comment>
418-
Potential evaporation rate from a bare soil surface [mm/hour]
419-
</comment>
420-
</textvar>
421-
422-
</group>
423-
424391
<group>
425392
<comment>
426393
**************************************************************

‎tests/data/tests_efas_1arcmin_yearly.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -388,39 +388,6 @@ You can use $(SettingsDir) or $(SettingsPath) to refer directory containing the
388388

389389
</group>
390390

391-
<group>
392-
<comment>
393-
**************************************************************
394-
REPORTED OUTPUT TIME SERIES
395-
**************************************************************
396-
</comment>
397-
398-
<textvar name="TAvgTS" value="$(PathOut)/tAvg.tss">
399-
<comment>
400-
Average temperature [deg C]
401-
</comment>
402-
</textvar>
403-
404-
<textvar name="ET0TS" value="$(PathOut)/et0.tss">
405-
<comment>
406-
Potential reference evapotranspiration rate [mm/day]
407-
</comment>
408-
</textvar>
409-
410-
<textvar name="E0TS" value="$(PathOut)/e0.tss">
411-
<comment>
412-
Potential evaporation rate of a free water surface [mm/day]
413-
</comment>
414-
</textvar>
415-
416-
<textvar name="ES0TS" value="$(PathOut)/es0.tss">
417-
<comment>
418-
Potential evaporation rate from a bare soil surface [mm/day]
419-
</comment>
420-
</textvar>
421-
422-
</group>
423-
424391
<group>
425392
<comment>
426393
**************************************************************

0 commit comments

Comments
 (0)