Skip to content

Commit

Permalink
Merge pull request ESCOMP#59 from ekluzek/tooutletdefault
Browse files Browse the repository at this point in the history
Make the default to send to outlet for all cases
  • Loading branch information
ekluzek committed Nov 14, 2022
2 parents 5b81cc5 + b50ddd4 commit abd2bc4
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 6 deletions.
4 changes: 2 additions & 2 deletions cime_config/namelist_definition_mosart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
<group>mosart_inparm</group>
<valid_values>direct_in_place,direct_to_outlet,none</valid_values>
<values>
<value>direct_in_place</value>
<value>direct_to_outlet</value>
</values>
<desc>
Method for bypassing routing model.
Expand All @@ -107,7 +107,7 @@
<group>mosart_inparm</group>
<valid_values>all,negative,threshold</valid_values>
<values>
<value>threshold</value>
<value>negative</value>
</values>
<desc>
Method for handling of qgwl runoff inputs.
Expand Down
13 changes: 11 additions & 2 deletions cime_config/testdefs/testlist_mosart.xml
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,22 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="PEM_D" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/negtooutlet">
<test name="PEM_D" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/inplacethreshold">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Set direct_to_outlet for negative flow</option>
<option name="comment" >Set direct_in_place for threshold negative flow</option>
</options>
</test>
<test name="SMS" grid="f10_f10_mg37" compset="I1850Clm50Sp" testmods="mosart/nobypass">
<machines>
<machine name="cheyenne" compiler="intel" category="mosart"></machine>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run without any bypass option</option>
</options>
</test>
</testlist>
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
qgwl_runoff_option = 'threshold'
bypass_routing_option = 'direct_in_place'

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
qgwl_runoff_option = 'all'
bypass_routing_option = 'none'
11 changes: 11 additions & 0 deletions docs/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
===============================================================
Tag name: mosart1_0_48
Originator(s): erik
Date: Nov 13, 2022
One-line Summary: Change bypass_routing option to direct_to_outlet

Change the bypass_routing option to negative flow is sent to
the river outlets.

Fixes #58 -- change bypass_routing default

===============================================================
Tag name: mosart1_0_47
Originator(s): erik
Expand Down

0 comments on commit abd2bc4

Please sign in to comment.