Skip to content

Commit edf907b

Browse files
casadojcasadoj
committed
Rename Fraser usecase
1 parent 8bcf2e9 commit edf907b

142 files changed

Lines changed: 283 additions & 339 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

LF_lat_lon_UseCase/dis_reference_LF_lat_lon.tss renamed to LF_fraser_usecase/dis_reference_LF_lat_lon.tss

File renamed without changes.

LF_lat_lon_UseCase/inflow/inflow.tss renamed to LF_fraser_usecase/inflow/inflow.tss

File renamed without changes.

LF_lat_lon_UseCase/inflow/inflow_new3.map renamed to LF_fraser_usecase/inflow/inflow_new3.map

File renamed without changes.

LF_lat_lon_UseCase/lisfloodSettings_reference_PreRun.xml renamed to LF_fraser_usecase/lisfloodSettings_reference_PreRun.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<lfsettings>
22

33
<lfoptions>
4-
<setoption choice="0" name="cropsEPIC"/>
4+
<setoption choice="0" name="cropsEPIC" />
55
#-----------------------------------------------------------
66
# modelling and reporting options
77
#-----------------------------------------------------------
@@ -24,7 +24,7 @@
2424
<setoption choice="1" name="SplitRouting" />
2525

2626
# use inflow data
27-
<setoption choice="1" name="inflow" />
27+
<setoption choice="0" name="inflow" />
2828

2929
# option to compute indicators
3030
<setoption choice="0" name="indicator" />
@@ -35,14 +35,14 @@
3535

3636
# option to read/write NetCDF
3737
<setoption choice="1" name="readNetcdfStack" />
38-
<setoption choice="1" name="writeNetcdfStack" />
38+
<setoption choice="0" name="writeNetcdfStack" />
3939
<setoption choice="1" name="writeNetcdf" />
4040

4141
#-----------------------------------------------------------
4242
# report time series
4343
#-----------------------------------------------------------
4444
# report discharge TS
45-
<setoption choice="1" name="repDischargeTs" />
45+
<setoption choice="0" name="repDischargeTs" />
4646

4747
# report gauges and sites
4848
<setoption choice="0" name="repStateSites" />
@@ -72,7 +72,7 @@
7272
<setoption choice="0" name="repSnowCoverMaps" />
7373
<setoption choice="0" name="repSnowMeltMaps" />
7474
<setoption choice="0" name="repThetaMaps" />
75-
<setoption choice="1" name="repThetaForestMaps" />
75+
<setoption choice="0" name="repThetaForestMaps" />
7676
<setoption choice="0" name="repLZMaps" />
7777
<setoption choice="0" name="repUZMaps" />
7878
<setoption choice="0" name="repGwPercUZLZMaps" />
@@ -118,8 +118,8 @@ The option "numCPUs_parallelNumba" may take the following values:
118118
(if NUMBA_NUM_THREADS is not set, will take the number of CPU cores determined by python's multiprocessing.cpu_count())
119119
- "1" : serial execution (not parallel)
120120
- "2", "3", ... : manual setting of the number of parallel threads.
121-
(if exceeding NUMBA_NUM_THREADS, the value is set to NUMBA_NUM_THREADS) -->
122-
<textvar name="numCPUs_parallelNumba" value="0"/>
121+
(if exceeding NUMBA_NUM_THREADS, the value is set to NUMBA_NUM_THREADS) --&gt;
122+
<textvar name="numCPUs_parallelNumba" value="0" />
123123

124124

125125

@@ -1564,7 +1564,7 @@ otherwise doesn't influence model results at all)
15641564

15651565

15661566
<textvar name="numCPUs_parallelKinematicWave" value="$(numCPUs_parallelKinematicWave)" />
1567-
<textvar name="numCPUs_parallelNumba" value="$(numCPUs_parallelNumba)"/>
1567+
<textvar name="numCPUs_parallelNumba" value="$(numCPUs_parallelNumba)" />
15681568

15691569
<textvar name="proj4_params" value="$(proj4_params)">
15701570
<comment>
@@ -1599,14 +1599,14 @@ This option sets the value of NetCDFTimeChunks to -1, meaning that the whole tim
15991599
The option "OutputMapsChunks" may take the following values:
16001600
- "[positive integer number]" : Dump outputs to disk every X steps (default 1)
16011601
</comment>
1602-
<textvar name="OutputMapsChunks" value="1"/>
1602+
<textvar name="OutputMapsChunks" value="1" />
16031603

16041604
<comment>
16051605
The option "OutputMapsDataType" sets the output data type and may take the following values:
16061606
- "float64"
16071607
- "float32"
16081608
</comment>
1609-
<textvar name="OutputMapsDataType" value="float64"/>
1609+
<textvar name="OutputMapsDataType" value="float64" />
16101610

16111611
<textvar name="netCDFtemplate" value="$(netCDFtemplate)">
16121612
<comment>

LF_lat_lon_UseCase/lisfloodSettings_reference_Run.xml renamed to LF_fraser_usecase/lisfloodSettings_reference_Run.xml

Lines changed: 91 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
11
<lfsettings>
22

33
<lfoptions>
4-
<setoption choice="0" name="cropsEPIC"/>
5-
#-----------------------------------------------------------
6-
# modelling and reporting options
7-
#-----------------------------------------------------------
8-
# options to turn hydrological modules on/off
9-
<setoption choice="0" name="groundwaterSmooth" />
10-
<setoption choice="1" name="gridSizeUserDefined" />
11-
12-
<setoption choice="0" name="wateruse" />
13-
<setoption choice="0" name="TransientWaterDemandChange" />
14-
<setoption choice="0" name="useWaterDemandAveYear" />
15-
<setoption choice="0" name="wateruseRegion" />
16-
17-
<setoption choice="0" name="drainedIrrigation" />
18-
<setoption choice="0" name="riceIrrigation" />
19-
<setoption choice="0" name="openwaterevapo" />
20-
<setoption choice="0" name="varfractionwater" />
21-
<setoption choice="0" name="simulateLakes" />
22-
<setoption choice="0" name="simulateReservoirs" />
23-
24-
<setoption choice="1" name="SplitRouting" />
25-
26-
# use inflow data
27-
<setoption choice="1" name="inflow" />
28-
29-
# option to compute indicators
30-
<setoption choice="0" name="indicator" />
31-
32-
# option to initialize Lisflood
33-
<setoption choice="0" name="InitLisflood" />
34-
<setoption choice="0" name="InitLisfloodwithoutSplit" />
35-
36-
# option to read/write NetCDF
37-
<setoption choice="1" name="readNetcdfStack" />
38-
<setoption choice="1" name="writeNetcdfStack" />
39-
<setoption choice="1" name="writeNetcdf" />
40-
41-
#-----------------------------------------------------------
42-
# report time series
43-
#-----------------------------------------------------------
44-
# report discharge TS
45-
<setoption choice="1" name="repDischargeTs" />
46-
47-
# report gauges and sites
48-
<setoption choice="0" name="repStateSites" />
49-
<setoption choice="0" name="repRateSites" />
50-
<setoption choice="0" name="repStateUpsGauges" />
51-
<setoption choice="0" name="repRateUpsGauges" />
52-
<setoption choice="0" name="repMeteoUpsGauges" />
53-
54-
# report reservoirs and lakes
55-
<setoption choice="0" name="repsimulateLakes" />
56-
<setoption choice="0" name="repsimulateReservoirs" />
57-
58-
#-----------------------------------------------------------
59-
# report maps
60-
#-----------------------------------------------------------
61-
# report state maps
62-
<setoption choice="0" name="repStateMaps" />
63-
64-
# report end maps
65-
<setoption choice="0" name="repEndMaps" />
66-
67-
# report maps
68-
<setoption choice="1" name="repDischargeMaps" />
69-
<setoption choice="0" name="repSurfaceRunoffMaps" />
70-
<setoption choice="0" name="repRainMaps" />
71-
<setoption choice="0" name="repSnowMaps" />
72-
<setoption choice="0" name="repSnowCoverMaps" />
73-
<setoption choice="0" name="repSnowMeltMaps" />
74-
<setoption choice="0" name="repThetaMaps" />
75-
<setoption choice="1" name="repThetaForestMaps" />
76-
<setoption choice="1" name="repThetaIrrigationMaps" />
77-
<setoption choice="0" name="repLZMaps" />
78-
<setoption choice="0" name="repUZMaps" />
79-
<setoption choice="0" name="repGwPercUZLZMaps" />
80-
<setoption choice="0" name="repRWS" />
81-
<setoption choice="0" name="repPFMaps" />
82-
<setoption choice="0" name="repPFForestMaps" />
83-
<setoption choice="0" name="repE2O2" />
84-
<setoption choice="0" name="repE2O1" />
85-
86-
87-
<setoption choice="0" name="repTotalAbs" />
88-
<setoption choice="0" name="repTotalWUse" />
89-
<setoption choice="0" name="repWIndex" />
4+
<setoption choice="0" name="cropsEPIC" />
5+
#-----------------------------------------------------------
6+
# modelling and reporting options
7+
#-----------------------------------------------------------
8+
# options to turn hydrological modules on/off
9+
<setoption choice="0" name="groundwaterSmooth" />
10+
<setoption choice="1" name="gridSizeUserDefined" />
11+
12+
<setoption choice="0" name="wateruse" />
13+
<setoption choice="0" name="TransientWaterDemandChange" />
14+
<setoption choice="0" name="useWaterDemandAveYear" />
15+
<setoption choice="0" name="wateruseRegion" />
16+
17+
<setoption choice="0" name="drainedIrrigation" />
18+
<setoption choice="0" name="riceIrrigation" />
19+
<setoption choice="0" name="openwaterevapo" />
20+
<setoption choice="0" name="varfractionwater" />
21+
<setoption choice="0" name="simulateLakes" />
22+
<setoption choice="0" name="simulateReservoirs" />
23+
24+
<setoption choice="1" name="SplitRouting" />
25+
26+
# use inflow data
27+
<setoption choice="0" name="inflow" />
28+
29+
# option to compute indicators
30+
<setoption choice="0" name="indicator" />
31+
32+
# option to initialize Lisflood
33+
<setoption choice="0" name="InitLisflood" />
34+
<setoption choice="0" name="InitLisfloodwithoutSplit" />
35+
36+
# option to read/write NetCDF
37+
<setoption choice="1" name="readNetcdfStack" />
38+
<setoption choice="0" name="writeNetcdfStack" />
39+
<setoption choice="1" name="writeNetcdf" />
40+
41+
#-----------------------------------------------------------
42+
# report time series
43+
#-----------------------------------------------------------
44+
# report discharge TS
45+
<setoption choice="0" name="repDischargeTs" />
46+
47+
# report gauges and sites
48+
<setoption choice="0" name="repStateSites" />
49+
<setoption choice="0" name="repRateSites" />
50+
<setoption choice="0" name="repStateUpsGauges" />
51+
<setoption choice="0" name="repRateUpsGauges" />
52+
<setoption choice="0" name="repMeteoUpsGauges" />
53+
54+
# report reservoirs and lakes
55+
<setoption choice="0" name="repsimulateLakes" />
56+
<setoption choice="0" name="repsimulateReservoirs" />
57+
58+
#-----------------------------------------------------------
59+
# report maps
60+
#-----------------------------------------------------------
61+
# report state maps
62+
<setoption choice="0" name="repStateMaps" />
63+
64+
# report end maps
65+
<setoption choice="0" name="repEndMaps" />
66+
67+
# report maps
68+
<setoption choice="1" name="repDischargeMaps" />
69+
<setoption choice="0" name="repSurfaceRunoffMaps" />
70+
<setoption choice="0" name="repRainMaps" />
71+
<setoption choice="0" name="repSnowMaps" />
72+
<setoption choice="0" name="repSnowCoverMaps" />
73+
<setoption choice="0" name="repSnowMeltMaps" />
74+
<setoption choice="0" name="repThetaMaps" />
75+
<setoption choice="0" name="repThetaForestMaps" />
76+
<setoption choice="0" name="repThetaIrrigationMaps" />
77+
<setoption choice="0" name="repLZMaps" />
78+
<setoption choice="0" name="repUZMaps" />
79+
<setoption choice="0" name="repGwPercUZLZMaps" />
80+
<setoption choice="0" name="repRWS" />
81+
<setoption choice="0" name="repPFMaps" />
82+
<setoption choice="0" name="repPFForestMaps" />
83+
<setoption choice="0" name="repE2O2" />
84+
<setoption choice="0" name="repE2O1" />
85+
86+
87+
<setoption choice="0" name="repTotalAbs" />
88+
<setoption choice="0" name="repTotalWUse" />
89+
<setoption choice="0" name="repWIndex" />
9090

9191
</lfoptions>
9292

@@ -121,8 +121,8 @@ The option "numCPUs_parallelNumba" may take the following values:
121121
(if NUMBA_NUM_THREADS is not set, will take the number of CPU cores determined by python's multiprocessing.cpu_count())
122122
- "1" : serial execution (not parallel)
123123
- "2", "3", ... : manual setting of the number of parallel threads.
124-
(if exceeding NUMBA_NUM_THREADS, the value is set to NUMBA_NUM_THREADS) -->
125-
<textvar name="numCPUs_parallelNumba" value="0"/>
124+
(if exceeding NUMBA_NUM_THREADS, the value is set to NUMBA_NUM_THREADS) --&gt;
125+
<textvar name="numCPUs_parallelNumba" value="0" />
126126

127127

128128

@@ -1567,7 +1567,7 @@ otherwise doesn't influence model results at all)
15671567

15681568

15691569
<textvar name="numCPUs_parallelKinematicWave" value="$(numCPUs_parallelKinematicWave)" />
1570-
<textvar name="numCPUs_parallelNumba" value="$(numCPUs_parallelNumba)"/>
1570+
<textvar name="numCPUs_parallelNumba" value="$(numCPUs_parallelNumba)" />
15711571

15721572
<textvar name="proj4_params" value="$(proj4_params)">
15731573
<comment>
@@ -1602,14 +1602,14 @@ This option sets the value of NetCDFTimeChunks to -1, meaning that the whole tim
16021602
The option "OutputMapsChunks" may take the following values:
16031603
- "[positive integer number]" : Dump outputs to disk every X steps (default 1)
16041604
</comment>
1605-
<textvar name="OutputMapsChunks" value="1"/>
1605+
<textvar name="OutputMapsChunks" value="1" />
16061606

16071607
<comment>
16081608
The option "OutputMapsDataType" sets the output data type and may take the following values:
16091609
- "float64"
16101610
- "float32"
16111611
</comment>
1612-
<textvar name="OutputMapsDataType" value="float64"/>
1612+
<textvar name="OutputMapsDataType" value="float64" />
16131613

16141614
<textvar name="netCDFtemplate" value="$(netCDFtemplate)">
16151615
<comment>

LF_lat_lon_UseCase/maps/gaugeloc.txt renamed to LF_fraser_usecase/maps/gaugeloc.txt

File renamed without changes.

LF_lat_lon_UseCase/maps/mask.map renamed to LF_fraser_usecase/maps/mask.map

File renamed without changes.

LF_lat_lon_UseCase/maps/masksmall.map renamed to LF_fraser_usecase/maps/masksmall.map

File renamed without changes.

LF_lat_lon_UseCase/maps/outlet.map renamed to LF_fraser_usecase/maps/outlet.map

File renamed without changes.

LF_lat_lon_UseCase/maps/outletsmall.map renamed to LF_fraser_usecase/maps/outletsmall.map

File renamed without changes.

0 commit comments

Comments
 (0)