Skip to content

Commit

Permalink
Merge pull request #924 from cacraigucar/cam_derecho_cesm_2_2
Browse files Browse the repository at this point in the history 
cam_cesm2_2_rel_09: Fix derecho tests on CESM2_2 branch
  • Loading branch information
@cacraigucar
cacraigucar authored Dec 7, 2023
2 parents 3931eee + 076b4a9 commit 3753320
Show file tree
Hide file tree
Showing 11 changed files with 1,564 additions and 870 deletions.
10 changes: 5 additions & 5 deletions Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,30 +9,30 @@ local_path = components/cice
required = True

[cime]
tag = cime5.8.28
tag = cime5.8.32.7
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
required = True

[cism]
tag = cism2_1_68
tag = cism2_1_69_a
protocol = git
repo_url = https://github.com/ESCOMP/cism-wrapper
local_path = components/cism
externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm1.0.dev107
tag = release-cesm2.2.03
protocol = git
repo_url = https://github.com/ESCOMP/ctsm
local_path = components/clm
externals = Externals_CLM.cfg
required = True

[mosart]
tag = mosart1_0_36
tag = mosart1_0_37_1
protocol = git
repo_url = https://github.com/ESCOMP/mosart
local_path = components/mosart
Expand All @@ -46,7 +46,7 @@ local_path = components/rtm
required = True

[fms]
tag = fi_20200609
tag = fi_20200609_cesm2.2_231205
protocol = git
repo_url = https://github.com/ESCOMP/FMS_interface.git
local_path = libraries/FMS
Expand Down
16 changes: 14 additions & 2 deletions bld/build-namelist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4051,13 +4051,21 @@ sub fv_decomp_set{
my $nlev = $cfg->get('nlev');
my ($ny, $nz);

my $waccmx = $cfg->get('waccmx');
my $nmaglat = 97;
my $nmaglon = 80;
my $nlatitudes = $nlat;
if ($waccmx and $nlat>$nmaglat) {
$nlatitudes = $nmaglat; # magnetic grid resolution
}

# die if bad input
if ($ntasks < 1) {
die "$ProgName - ERROR: fv_decomp_set: bad input: ntasks=$ntasks.\n" .
" -ntask argument to build-namelist is wrong.";
}

NZ: for ($nz = 1; $nz <= $nlev; ++$nz) {
NZLOOP: for ($nz = 1; $nz <= $nlev; ++$nz) {

# test that $nz divides $ntasks
if ($ntasks%$nz == 0) {
Expand All @@ -4066,7 +4074,7 @@ sub fv_decomp_set{

# test that y subdomains contain at least 3 latitudes
# if so then done
if (3*$ny <= $nlat) {last NZ;}
if (3*$ny <= $nlatitudes) {last NZLOOP;}
}
}

Expand All @@ -4075,6 +4083,10 @@ sub fv_decomp_set{
die "$ProgName - ERROR: fv_decomp_set failed to find a decomposition.\n" .
" npr_yz needs to be set by the user.";
}
if ($waccmx and $nmaglon/$nz < 4) {
die "$ProgName - ERROR: fv_decomp_set failed to find a decomposition.\n"
. " Too many MPI tasks to properly decompose WACCMX magnetic grid.";
}

return "$ny,$nz,$nz,$ny";
}
Expand Down
52 changes: 26 additions & 26 deletions cime_config/config_compsets.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,19 +52,19 @@

<compset>
<alias>F2000climo</alias>
<lname>2000_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2000_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FHIST</alias>
<lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FHIST_BGC</alias>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<!-- <science_support grid="f09_f09_mg17"/> -->
</compset>

Expand Down Expand Up @@ -189,12 +189,12 @@

<compset>
<alias>F2010climo</alias>
<lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2010_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>F1850</alias>
<lname>1850_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>1850_CAM60_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand All @@ -209,12 +209,12 @@

<compset>
<alias>F1850_BDRD</alias>
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>FHIST_BDRD</alias>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<!-- CAM simpler model compsets -->
Expand Down Expand Up @@ -277,25 +277,25 @@

<compset>
<alias>FC2000climo</alias>
<lname>2000_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2000_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FC2010climo</alias>
<lname>2010_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2010_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FCHIST</alias>
<lname>HIST_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%CCTS1_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCvbsxHIST</alias>
<lname>HIST_CAM60%CVBSX_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%CVBSX_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>
<compset>
<alias>FCfireHIST</alias>
<lname>HIST_CAM60%CFIRE_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%CFIRE_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down Expand Up @@ -333,12 +333,12 @@

<compset>
<alias>F1850_BDRD</alias>
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
<lname>1850_CAM60_CLM50%BGC_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<compset>
<alias>FHIST_BDRD</alias>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV_BGC%BDRD</lname>
<lname>HIST_CAM60_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV_BGC%BDRD</lname>
</compset>

<!-- CAM simpler model compsets -->
Expand Down Expand Up @@ -385,43 +385,43 @@

<compset>
<alias>FWHIST</alias>
<lname>HIST_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FWHIST_BGC</alias>
<lname>HIST_CAM60%WCTS_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%WCTS_CLM50%BGC-CROP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FWsc2010climo</alias>
<lname>2010_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2010_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FWsc2000climo</alias>
<lname>2000_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2000_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FWsc1850</alias>
<lname>1850_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>1850_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FWscHIST</alias>
<lname>HIST_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%WCSC_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

<compset>
<alias>FW1850</alias>
<lname>1850_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>1850_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
<science_support grid="f09_f09_mg17"/>
</compset>

Expand All @@ -431,17 +431,17 @@

<compset>
<alias>FWma2000climo</alias>
<lname>2000_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2000_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FW2000climo</alias>
<lname>2000_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2000_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>FW2010climo</alias>
<lname>2010_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>2010_CAM60%WCTS_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand All @@ -456,7 +456,7 @@

<compset>
<alias>FWmaHIST</alias>
<lname>HIST_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%WCCM_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand All @@ -466,7 +466,7 @@

<compset>
<alias>FWmadHIST</alias>
<lname>HIST_CAM60%WCMD_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_CISM2%NOEVOLVE_SWAV</lname>
<lname>HIST_CAM60%WCMD_CLM50%SP_CICE%PRES_DOCN%DOM_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down
Loading

0 comments on commit 3753320

Please sign in to comment.