Skip to content

Commit 3ad78d7

Browse files
rljacobrljacob
authored
Merge branch 'rljacob/mbcpl/misc-fixes' (PR #6877)
Fix a few issues including: Add ocn_c2_glctf to seq_infodata as in mct coupler which is needed after merging 31d8b7b Add ATM2ICE_FMAPNAME_NONLINEAR to moab coupler. Needed to create ne30 cases Add a tri-grid case to moab dev test suite. Update config_component_e3sm.xml with latest driver-mct version. [BFB]
2 parents 31452ac + a251c5a commit 3ad78d7

File tree

4 files changed

+51
-5
lines changed

4 files changed

+51
-5
lines changed

‎cime_config/tests.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -781,6 +781,7 @@
781781
"e3sm_moab_dev" : {
782782
"time" : "01:00:00",
783783
"tests" : (
784+
"ERS_Vmoab_Ld3.ne4pg2_r05_oQU480.WCYCL1850NS",
784785
"ERS_Vmoab_Ld3.ne4pg2_oQU480.WCYCL1850NS",
785786
"ERS_Vmoab_Ld3.ne4pg2_oQU480.F1850",
786787
"ERS_Vmoab_Ld3.ne4pg2_ne4pg2.I1850CNPRDCTCBCTOP",

‎driver-moab/cime_config/config_component.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1375,6 +1375,14 @@
13751375
<desc>atm2ocn flux mapping file</desc>
13761376
</entry>
13771377

1378+
<entry id="ATM2ICE_FMAPNAME_NONLINEAR">
1379+
<type>char</type>
1380+
<default_value>idmap_ignore</default_value>
1381+
<group>run_domain</group>
1382+
<file>env_run.xml</file>
1383+
<desc>atm2ice flux mapping file</desc>
1384+
</entry>
1385+
13781386
<entry id="ATM2OCN_SMAPNAME">
13791387
<type>char</type>
13801388
<default_value>idmap</default_value>

‎driver-moab/cime_config/config_component_e3sm.xml‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,18 @@
185185
<desc>Turn on the passing of polar fields through the coupler</desc>
186186
</entry>
187187

188+
<entry id="FLDS_TF">
189+
<type>logical</type>
190+
<valid_values>TRUE,FALSE</valid_values>
191+
<default_value>FALSE</default_value>
192+
<values match="last">
193+
<value compset="_MPASO.*_MALI">TRUE</value>
194+
</values>
195+
<group>run_flags</group>
196+
<file>env_run.xml</file>
197+
<desc>Turn on the passing of ocean thermal forcing fields through the coupler</desc>
198+
</entry>
199+
188200
<entry id="TFREEZE_SALTWATER_OPTION">
189201
<type>char</type>
190202
<valid_values>minus1p8,linear_salt,mushy</valid_values>
@@ -245,6 +257,7 @@
245257
<value compset="_SOCN" >CESM1_MOD</value>
246258
<value compset="_MPASO" >CESM1_MOD</value>
247259
<value compset="_MPASSI.*_MPASO" >RASM_OPTION1</value>
260+
<value compset="_MPASSI.*_MPASO" grid="oi%RRSwISC6to18E3r5">RASM_OPTION2</value>
248261
</values>
249262
<group>run_coupling</group>
250263
<file>env_run.xml</file>
@@ -275,7 +288,7 @@
275288
<value compset="_DATM" >none</value>
276289
<value compset="_BGC%BPRP">CO2C</value>
277290
<value compset="HIST.*_DATM%(QIA|CRU|GSW)">CO2A</value>
278-
<value compset="20TR.*_DATM%(QIA|CRU|GSW)">CO2A</value>
291+
<value compset="20TR.*_DATM%(QIA|CRU|GSW|E3SMWCv2|CPLWCH)">CO2A</value>
279292
<value compset="RCP.*_DATM%(QIA|CRU|GSW)" >CO2A</value>
280293
<value compset="_DATM%IAF.*_MPASO%OECO" >CO2A</value>
281294
<value compset="_DATM%JRA.*_MPASO%OECO" >CO2A</value>
@@ -383,6 +396,10 @@
383396
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oQU120">24</value>
384397
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oEC60to30v3">48</value>
385398
<value compset="_DATM.*_SLND.*MPAS" grid="oi%ECwISC30to60E1r2">48</value>
399+
<value compset="_DATM.*_SLND.*MPAS" grid="oi%FRISwISC08to60E3r1">180</value>
400+
<value compset="_DATM.*_SLND.*MPAS" grid="oi%FRISwISC04to60E3r1">360</value>
401+
<value compset="_DATM.*_SLND.*MPAS" grid="oi%FRISwISC02to60E3r1">720</value>
402+
<value compset="_DATM.*_SLND.*MPAS" grid="oi%FRISwISC01to60E3r1">1440</value>
386403
<value compset="_DATM.*_SLND.*MPAS" grid="oi%EC30to60E2r2">48</value>
387404
<value compset="_DATM.*_SLND.*MPAS" grid="oi%WC14to60E2r3">48</value>
388405
<value compset="_DATM.*_SLND.*MPAS" grid="oi%oRRS30to10v3">96</value>
@@ -407,6 +424,7 @@
407424
<value compset=".+" grid="a%ne256np4">144</value>
408425
<value compset=".+" grid="a%ne512np4">432</value>
409426
<value compset=".+" grid="a%ne1024np4">864</value>
427+
<value compset=".+" grid="a%ne0np4_CAx32v1">864</value>
410428
<value compset=".+" grid="a%ne0np4_arm_x8v3" >144</value>
411429
<value compset=".+" grid="a%ne0np4_conus_x4v1" >96</value>
412430
<value compset=".+" grid="a%ne0np4_northamericax4v1" >48</value>
@@ -446,6 +464,7 @@
446464
<value compset="_SLND.*SOCN.*_MALI">1</value>
447465
<value compset="_DATM.*_SLND.*MPASO.*_MALI">$ATM_NCPL</value>
448466
<value compset="_EAM.*_ELM.*MPASO">48</value>
467+
<value compset="_EAMXX.*_ELM.*MPASO">$ATM_NCPL</value>
449468
<value compset="_EAM.*_ELM.*MPASO" grid="a%ne4np4">$ATM_NCPL</value>
450469
<value compset="_EAM.*_ELM.*MPASO" grid="a%ne11np4">12</value>
451470
<value compset="_EAM.*_ELM.*MPASO" grid="a%ne120np4">96</value>
@@ -747,8 +766,13 @@
747766
<value compset="^1950.+CMIP6" >312.821</value>
748767
<value compset="^2010" >388.717</value>
749768
<value compset="^2010.+CMIP6" >388.717</value>
750-
<value compset="^SSP585.+CMIP6" >0.000001</value>
751-
<value compset="^SSP370.+CMIP6" >0.000001</value>
769+
<value compset="^20TR.+CMIP6-AER" >284.317</value>
770+
<value compset="^20TR.+CMIP6-xGHG-xAER" >284.317</value>
771+
<value compset="^20TR.+CMIP6-NAT" >284.317</value>
772+
<value compset="^20TR.+CMIP6-OZONE" >284.317</value>
773+
<value compset="^20TR.+CMIP6-LULC" >284.317</value>
774+
<value compset="^20TR.+CMIP6-VOLC" >284.317</value>
775+
<value compset="^SSP.+CMIP6" >0.000001</value>
752776
<value compset="^20TR.*BGC%BCRC" >284.317</value>
753777
<value compset="^20TR.*BGC%BCRD" >284.317</value>
754778
<value compset="^20TR.*BGC%BDRC" >284.317</value>
@@ -851,6 +875,7 @@
851875
<default_value>1</default_value>
852876
<values match="last">
853877
<value compset=".+EAM%CMIP6" >2</value>
878+
<value compset=".+EAM%MMF" >2</value>
854879
</values>
855880
<group>shr_dust_nl</group>
856881
<file>env_run.xml</file>

‎driver-moab/shr/seq_infodata_mod.F90‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ MODULE seq_infodata_mod
198198
logical :: ocn_prognostic ! does component model need input data from driver
199199
logical :: ocnrof_prognostic ! does component need rof data
200200
logical :: ocn_c2_glcshelf ! will ocn component send data for ice shelf fluxes in driver
201+
logical :: ocn_c2_glctf ! will ocn component send data for thermal forcing in driver
201202
logical :: ice_present ! does component model exist
202203
logical :: ice_prognostic ! does component model need input data from driver
203204
logical :: iceberg_prognostic ! does the ice model support icebergs
@@ -764,6 +765,7 @@ SUBROUTINE seq_infodata_Init( infodata, nmlfile, ID, pioid, cpl_tag)
764765
infodata%ocn_prognostic = .false.
765766
infodata%ocnrof_prognostic = .false.
766767
infodata%ocn_c2_glcshelf = .false.
768+
infodata%ocn_c2_glctf = .false.
767769
infodata%ice_prognostic = .false.
768770
infodata%glc_prognostic = .false.
769771
! It's safest to assume glc_coupled_fluxes = .true. if it's not set elsewhere,
@@ -1013,7 +1015,8 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
10131015
atm_present, atm_prognostic, &
10141016
lnd_present, lnd_prognostic, &
10151017
rof_present, rof_prognostic, rofocn_prognostic, &
1016-
ocn_present, ocn_prognostic, ocnrof_prognostic, ocn_c2_glcshelf, &
1018+
ocn_present, ocn_prognostic, ocnrof_prognostic, &
1019+
ocn_c2_glcshelf, ocn_c2_glctf, &
10171020
ice_present, ice_prognostic, &
10181021
glc_present, glc_prognostic, &
10191022
iac_present, iac_prognostic, &
@@ -1187,6 +1190,7 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
11871190
logical, optional, intent(OUT) :: ocn_prognostic
11881191
logical, optional, intent(OUT) :: ocnrof_prognostic
11891192
logical, optional, intent(OUT) :: ocn_c2_glcshelf
1193+
logical, optional, intent(OUT) :: ocn_c2_glctf
11901194
logical, optional, intent(OUT) :: ice_present
11911195
logical, optional, intent(OUT) :: ice_prognostic
11921196
logical, optional, intent(OUT) :: iceberg_prognostic
@@ -1379,6 +1383,7 @@ SUBROUTINE seq_infodata_GetData_explicit( infodata, cime_model, case_name, case_
13791383
if ( present(ocn_prognostic) ) ocn_prognostic = infodata%ocn_prognostic
13801384
if ( present(ocnrof_prognostic) ) ocnrof_prognostic = infodata%ocnrof_prognostic
13811385
if ( present(ocn_c2_glcshelf) ) ocn_c2_glcshelf = infodata%ocn_c2_glcshelf
1386+
if ( present(ocn_c2_glctf) ) ocn_c2_glctf = infodata%ocn_c2_glctf
13821387
if ( present(ice_present) ) ice_present = infodata%ice_present
13831388
if ( present(ice_prognostic) ) ice_prognostic = infodata%ice_prognostic
13841389
if ( present(iceberg_prognostic)) iceberg_prognostic = infodata%iceberg_prognostic
@@ -1578,7 +1583,8 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
15781583
atm_present, atm_prognostic, &
15791584
lnd_present, lnd_prognostic, &
15801585
rof_present, rof_prognostic, rofocn_prognostic, &
1581-
ocn_present, ocn_prognostic, ocnrof_prognostic, ocn_c2_glcshelf, &
1586+
ocn_present, ocn_prognostic, ocnrof_prognostic, &
1587+
ocn_c2_glcshelf, ocn_c2_glctf, &
15821588
ice_present, ice_prognostic, &
15831589
glc_present, glc_prognostic, &
15841590
glc_coupled_fluxes, &
@@ -1753,6 +1759,7 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
17531759
logical, optional, intent(IN) :: ocn_prognostic
17541760
logical, optional, intent(IN) :: ocnrof_prognostic
17551761
logical, optional, intent(IN) :: ocn_c2_glcshelf
1762+
logical, optional, intent(IN) :: ocn_c2_glctf
17561763
logical, optional, intent(IN) :: ice_present
17571764
logical, optional, intent(IN) :: ice_prognostic
17581765
logical, optional, intent(IN) :: iceberg_prognostic
@@ -1944,6 +1951,7 @@ SUBROUTINE seq_infodata_PutData_explicit( infodata, cime_model, case_name, case_
19441951
if ( present(ocn_prognostic) ) infodata%ocn_prognostic = ocn_prognostic
19451952
if ( present(ocnrof_prognostic)) infodata%ocnrof_prognostic = ocnrof_prognostic
19461953
if ( present(ocn_c2_glcshelf)) infodata%ocn_c2_glcshelf = ocn_c2_glcshelf
1954+
if ( present(ocn_c2_glctf)) infodata%ocn_c2_glctf = ocn_c2_glctf
19471955
if ( present(ice_present) ) infodata%ice_present = ice_present
19481956
if ( present(ice_prognostic) ) infodata%ice_prognostic = ice_prognostic
19491957
if ( present(iceberg_prognostic)) infodata%iceberg_prognostic = iceberg_prognostic
@@ -2258,6 +2266,7 @@ subroutine seq_infodata_bcast(infodata,mpicom)
22582266
call shr_mpi_bcast(infodata%ocn_prognostic, mpicom)
22592267
call shr_mpi_bcast(infodata%ocnrof_prognostic, mpicom)
22602268
call shr_mpi_bcast(infodata%ocn_c2_glcshelf, mpicom)
2269+
call shr_mpi_bcast(infodata%ocn_c2_glctf, mpicom)
22612270
call shr_mpi_bcast(infodata%ice_present, mpicom)
22622271
call shr_mpi_bcast(infodata%ice_prognostic, mpicom)
22632272
call shr_mpi_bcast(infodata%iceberg_prognostic, mpicom)
@@ -2554,6 +2563,7 @@ subroutine seq_infodata_Exchange(infodata,ID,type)
25542563
call shr_mpi_bcast(infodata%ocn_prognostic, mpicom, pebcast=cmppe)
25552564
call shr_mpi_bcast(infodata%ocnrof_prognostic, mpicom, pebcast=cmppe)
25562565
call shr_mpi_bcast(infodata%ocn_c2_glcshelf, mpicom, pebcast=cmppe)
2566+
call shr_mpi_bcast(infodata%ocn_c2_glctf, mpicom, pebcast=cmppe)
25572567
call shr_mpi_bcast(infodata%ocn_nx, mpicom, pebcast=cmppe)
25582568
call shr_mpi_bcast(infodata%ocn_ny, mpicom, pebcast=cmppe)
25592569
call shr_mpi_bcast(infodata%ocn_domain, mpicom, pebcast=cmppe)
@@ -2632,6 +2642,7 @@ subroutine seq_infodata_Exchange(infodata,ID,type)
26322642
call shr_mpi_bcast(infodata%ocn_prognostic, mpicom, pebcast=cplpe)
26332643
call shr_mpi_bcast(infodata%ocnrof_prognostic, mpicom, pebcast=cplpe)
26342644
call shr_mpi_bcast(infodata%ocn_c2_glcshelf, mpicom, pebcast=cplpe)
2645+
call shr_mpi_bcast(infodata%ocn_c2_glctf, mpicom, pebcast=cplpe)
26352646
call shr_mpi_bcast(infodata%ice_present, mpicom, pebcast=cplpe)
26362647
call shr_mpi_bcast(infodata%ice_prognostic, mpicom, pebcast=cplpe)
26372648
call shr_mpi_bcast(infodata%iceberg_prognostic, mpicom, pebcast=cplpe)
@@ -2984,6 +2995,7 @@ SUBROUTINE seq_infodata_print( infodata )
29842995
write(logunit,F0L) subname,'ocn_prognostic = ', infodata%ocn_prognostic
29852996
write(logunit,F0L) subname,'ocnrof_prognostic = ', infodata%ocnrof_prognostic
29862997
write(logunit,F0L) subname,'ocn_c2_glcshelf = ', infodata%ocn_c2_glcshelf
2998+
write(logunit,F0L) subname,'ocn_c2_glctf = ', infodata%ocn_c2_glctf
29872999
write(logunit,F0L) subname,'ice_present = ', infodata%ice_present
29883000
write(logunit,F0L) subname,'ice_prognostic = ', infodata%ice_prognostic
29893001
write(logunit,F0L) subname,'iceberg_prognostic = ', infodata%iceberg_prognostic

0 commit comments

Comments
 (0)