Skip to content

Commit

Permalink
Added test for MCT warm start
Browse files Browse the repository at this point in the history
  • Loading branch information
Cinzia Mazzetti committed Nov 20, 2024
1 parent 516f7df commit c1b48b9
Show file tree
Hide file tree
Showing 6 changed files with 6,386 additions and 1 deletion.
28 changes: 27 additions & 1 deletion tests/data/LF_MCT_UseCase/settings/mct_cold.xml
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,14 @@ You can use builtin path variables in this template and reference to other paths

<textvar name="ChanDepthTMult" value="1.0">
<comment>
$(PathParams)/params_ChanDepthTMult
Multiplier [] applied to ChanDepthThreshold
</comment>
</textvar>

<textvar name="ChanSMult" value="1.0">
<comment>
$(PathParams)/params_ChanSMult
Multiplier [] applied to ChanSdXdY
</comment>
</textvar>
Expand All @@ -564,7 +566,7 @@ You can use builtin path variables in this template and reference to other paths
</comment>
</textvar>

<textvar name="PathInit" value="$(PathRoot)/init">
<textvar name="PathInit" value="$(PathRoot)/out">
<comment>
INITDIR
Path of the initial value maps e.g. lzavin.map (org=$(PathRoot)/outPo)
Expand Down Expand Up @@ -3069,6 +3071,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTState" value="$(PathOut)/prevcm">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTState" value="$(PathOut)/prevdm">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestState" value="$(PathOut)/dslrf">
<comment>
Reported days since last rain
Expand Down Expand Up @@ -3344,6 +3358,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTEnd" value="$(PathOut)/prevcm.end">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTEnd" value="$(PathOut)/prevdm.end">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestEnd" value="$(PathOut)/dslrf.end">
<comment>
Reported days since last rain
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -539,12 +539,14 @@ You can use builtin path variables in this template and reference to other paths

<textvar name="ChanDepthTMult" value="1.0">
<comment>
$(PathParams)/params_ChanDepthTMult
Multiplier [] applied to ChanDepthThreshold
</comment>
</textvar>

<textvar name="ChanSMult" value="1.0">
<comment>
$(PathParams)/params_ChanSMult
Multiplier [] applied to ChanSdXdY
</comment>
</textvar>
Expand Down Expand Up @@ -3070,6 +3072,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTState" value="$(PathOut)/prevcm">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTState" value="$(PathOut)/prevdm">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestState" value="$(PathOut)/dslrf">
<comment>
Reported days since last rain
Expand Down Expand Up @@ -3345,6 +3359,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTEnd" value="$(PathOut)/prevcm.end">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTEnd" value="$(PathOut)/prevdm.end">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestEnd" value="$(PathOut)/dslrf.end">
<comment>
Reported days since last rain
Expand Down
26 changes: 26 additions & 0 deletions tests/data/LF_MCT_UseCase/settings/mct_inflow.xml
Original file line number Diff line number Diff line change
Expand Up @@ -538,12 +538,14 @@ You can use builtin path variables in this template and reference to other paths

<textvar name="ChanDepthTMult" value="1.0">
<comment>
$(PathParams)/params_ChanDepthTMult
Multiplier [] applied to ChanDepthThreshold
</comment>
</textvar>

<textvar name="ChanSMult" value="1.0">
<comment>
$(PathParams)/params_ChanSMult
Multiplier [] applied to ChanSdXdY
</comment>
</textvar>
Expand Down Expand Up @@ -3069,6 +3071,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTState" value="$(PathOut)/prevcm">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTState" value="$(PathOut)/prevdm">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestState" value="$(PathOut)/dslrf">
<comment>
Reported days since last rain
Expand Down Expand Up @@ -3344,6 +3358,18 @@ LFBINDING: MORE LOW-LEVEL CONTROL OVER MODEL IN- AND OUTPUT
</comment>
</textvar>

<textvar name="PrevCmMCTEnd" value="$(PathOut)/prevcm.end">
<comment>
Courant number at previous step for MCT routing
</comment>
</textvar>

<textvar name="PrevDmMCTEnd" value="$(PathOut)/prevdm.end">
<comment>
Reynolds number at previous step for MCT routing
</comment>
</textvar>

<textvar name="DSLRForestEnd" value="$(PathOut)/dslrf.end">
<comment>
Reported days since last rain
Expand Down
Loading

0 comments on commit c1b48b9

Please sign in to comment.