Skip to content

Commit

Permalink
Merge branch 'bishtgautam/lnd/buildnml' into next (PR #862)
Browse files Browse the repository at this point in the history 
clm.buildnml scripts now sends -mask to
build-namelist script. This generates land namelist
with correct finidat value when there are multiple
land-ocean masks (e.g. gx1v6 and oEC60to30) for a single
land grid (e.g. ne30np4).

This change requires that all new land-ocean masks must
be added in
components/clm/bld/namelist_files/namelist_definition_clm4_5.xml

Fixes #861
[NML]
  • Loading branch information
@rljacob
rljacob committed Apr 27, 2016
2 parents b3e9ae6 + b18f3b4 commit e65b35a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 16 deletions.
15 changes: 0 additions & 15 deletions cime/scripts/Tools/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -970,11 +970,7 @@ CAM[45]%L60 => CAM with 60 layers and full gravity wave spectrum:
<!-- CLM_BLDNML_OPTS is not additive, we must list all possible combinations -->
<CLM_BLDNML_OPTS compset="%CNCR" >-ignore_ic_year</CLM_BLDNML_OPTS> <!-- ERROR: Never matched, see bug 2025 -->
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SP" >-bgc sp</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SP" mask="oEC60to30">-bgc sp -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SP" mask="oRRS15to5">-bgc sp -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SPBC" >-bgc sp -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SPBC" mask="oEC60to30" >-bgc sp -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*SPBC" mask="oRRS15to5" >-bgc sp -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CN" >-bgc cn</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*BGC" >-bgc bgc</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CN-CROP" >-bgc cn -crop</CLM_BLDNML_OPTS>
Expand All @@ -990,17 +986,6 @@ CAM[45]%L60 => CAM with 60 layers and full gravity wave spectrum:
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPRDCTCBC" >-bgc cn -nutrient cnp -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNECACTCBC" >-bgc cn -nutrient cn -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPECACTCBC">-bgc cn -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CRDCTCBC" mask="oEC60to30">-bgc cn -nutrient c -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNRDCTCBC" mask="oEC60to30">-bgc cn -nutrient cn -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPRDCTCBC" mask="oEC60to30">-bgc cn -nutrient cnp -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNECACTCBC" mask="oEC60to30">-bgc cn -nutrient cn -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPECACTCBC" mask="oEC60to30">-bgc cn -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oEC60to30</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CRDCTCBC" mask="oRRS15to5">-bgc cn -nutrient c -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNRDCTCBC" mask="oRRS15to5">-bgc cn -nutrient cn -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPRDCTCBC" mask="oRRS15to5">-bgc cn -nutrient cnp -nutrient_comp_pathway rd -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNECACTCBC" mask="oRRS15to5">-bgc cn -nutrient cn -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM45%[^_]*CNPECACTCBC" mask="oRRS15to5">-bgc cn -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane -nitrif_denitrif -fsnowoptics lnd/clm2/snicardata/snicar_optics_5bnd_mam_c140303.nc -mask oRRS15to5</CLM_BLDNML_OPTS>


<CLM_BLDNML_OPTS compset="_CLM50%[^_]*SP" >-bgc sp</CLM_BLDNML_OPTS>
<CLM_BLDNML_OPTS compset="_CLM50%[^_]*BGC" >-bgc bgc</CLM_BLDNML_OPTS>
Expand Down
3 changes: 3 additions & 0 deletions components/clm/bld/clm.buildnml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ while ($inst_counter <= $NINST_LND) {
$sysmod = "$sysmod -envxml_dir $CASEROOT -l_ncpl $LND_NCPL -lnd_frac ${LND_DOMAIN_PATH}/${LND_DOMAIN_FILE}";
$sysmod = "$sysmod -glc_nec $GLC_NEC -co2_ppmv $CCSM_CO2_PPMV -co2_type $CLM_CO2_TYPE ";
$sysmod = "$sysmod -config $CASEBUILD/clmconf/config_cache.xml $CLM_BLDNML_OPTS";
if ($MASK_GRID ne "reg") {
$sysmod = "$sysmod -mask $MASK_GRID";
}
system($sysmod) == 0 or die "ERROR clm.buildnml: $sysmod failed: $?\n";

# -----------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion components/clm/bld/namelist_files/namelist_definition_clm4_5.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1122,7 +1122,7 @@ Representative concentration pathway for future scenarios [radiative forcing at

<entry id="mask" type="char*10" category="default_settings"
group="default_settings"
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oRRS15to5">
valid_values="USGS,gx3v7,gx1v6,navy,test,tx0.1v2,tx1v1,T62,cruncep,oEC60to30,oRRS15to5,mp120v1,oQU240,oQU120,oRRS30to10,360x720cru,NLDASww3a">
Land mask description
</entry>

Expand Down

0 comments on commit e65b35a

Please sign in to comment.