Skip to content

Commit

Permalink
Merge pull request ESCOMP#6 from AleksiNummelin/feature_highresBLOM
Browse files Browse the repository at this point in the history
Allow for global 0.125 deg ocean configuration
  • Loading branch information
DirkOlivie authored Apr 6, 2021
2 parents 576892b + 673922b commit 9f8cb64
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_definition_clm4_5.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1805,7 +1805,7 @@ hist means do NOT use a future scenario, just use historical data.

<entry id="mask" type="char*10" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,tnx1v1,tnx0.25v1,tnx0.25v3,tnx0.25v4,tnx1v4,tnx1v3">
valid_values="USGS,gx3v7,gx1v6,gx1v7,navy,test,tx0.1v2,tx1v1,T62,cruncep,tnx1v1,tnx0.25v1,tnx0.25v3,tnx0.25v4,tnx0.125v4,tnx1v4,tnx1v3">
Land mask description
</entry>

Expand Down
2 changes: 1 addition & 1 deletion cime_config/buildnml
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ def buildnml(case, caseroot, compname):
create_namelist_infile(case, user_nl_file, namelist_infile, "\n".join(infile_lines))

cmd = os.path.join(lnd_root,"bld","build-namelist")
if ocn_grid == "tnx1v1" or ocn_grid == "tnx0.25v1" or ocn_grid == "tnx1v3" or ocn_grid == "tnx1v4" or ocn_grid == "tnx0.25v3" or ocn_grid == "tnx0.25v4":
if ocn_grid == "tnx1v1" or ocn_grid == "tnx0.25v1" or ocn_grid == "tnx1v3" or ocn_grid == "tnx1v4" or ocn_grid == "tnx0.25v3" or ocn_grid == "tnx0.25v4" or ocn_grid == "tnx0.125v4":
command = ("%s -cimeroot %s -infile %s -csmdata %s -inputdata %s %s -namelist \"&clm_inparm start_ymd=%s %s/ \" "
"%s %s -res %s %s -clm_start_type %s -envxml_dir %s -l_ncpl %s "
"-lnd_frac %s -glc_nec %s -co2_ppmv %s -co2_type %s -config %s "
Expand Down

0 comments on commit 9f8cb64

Please sign in to comment.