Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cime_config/config_archive.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<components version="2.0">
<comp_archive_spec compname="mom" compclass="ocn">
<rest_file_extension>r</rest_file_extension>
<rest_file_extension>r_stoch</rest_file_extension>
<!-- match filenames of the form
h[.optional stream name][._optional instance number].(date string).nc[.optional tile number] -->
<hist_file_extension>h(\.\w+)?(\._\d*)?\.[-\d+]+\.nc(\.\d*)?(\.gz)?$</hist_file_extension>
Expand All @@ -23,6 +24,7 @@
<tfile disposition="copy">rpointer.ocn.1976-01-01-00000</tfile>
<tfile disposition="copy">casename.mom6.r.1976-01-01-00000.nc</tfile>
<tfile disposition="copy">casename.mom6.r.1976-01-01-00000_1.nc</tfile>
<tfile disposition="copy">casename.mom6.r_stoch.1976-01-01-00000.nc</tfile>
<tfile disposition="move">casename.mom6.h.bgc.native.1976-01-01.nc</tfile>
<tfile disposition="move">casename.mom6.h.bgc.z.1976-01-01.nc</tfile>
<tfile disposition="move">casename.mom6.h.native.1976-01-01-00000.nc</tfile>
Expand Down
4 changes: 4 additions & 0 deletions param_templates/input_nml.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ mpp_io_nml:
values: .true.

nam_stochy:
stochini:
values:
$CONTINUE_RUN == True: .true.
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mnlevy1981 are you suggesting this addition?:
$RUN_TYPE == "branch": .true.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so! As it stands, it looks to me like stochini won't be set in a branch run, but it should be.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll try an ERI test and let you know.

else: .false.
new_lscale:
values: .true.
OCNSKEB:
Expand Down
6 changes: 6 additions & 0 deletions param_templates/json/input_nml.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
}
},
"nam_stochy": {
"stochini": {
"values": {
"$CONTINUE_RUN == True": ".true.",
"else": ".false."
}
},
"new_lscale": {
"values": ".true."
},
Expand Down