From 673922bf7da8a83918669b1e911ba1d0ac9fb2cc Mon Sep 17 00:00:00 2001 From: Aleksi Nummelin Date: Tue, 16 Feb 2021 21:08:39 +0100 Subject: [PATCH] Allow for global 0.125 ocean configuration --- bld/namelist_files/namelist_definition_clm4_5.xml | 2 +- cime_config/buildnml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bld/namelist_files/namelist_definition_clm4_5.xml b/bld/namelist_files/namelist_definition_clm4_5.xml index bc8731887e..3eae975b3d 100644 --- a/bld/namelist_files/namelist_definition_clm4_5.xml +++ b/bld/namelist_files/namelist_definition_clm4_5.xml @@ -1805,7 +1805,7 @@ hist means do NOT use a future scenario, just use historical data. + 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 diff --git a/cime_config/buildnml b/cime_config/buildnml index f880a49bf6..06ec4c6371 100755 --- a/cime_config/buildnml +++ b/cime_config/buildnml @@ -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 "