Skip to content

Commit

Permalink
Better differentiate ocn->glc coupling for shelf and tf
Browse files Browse the repository at this point in the history 
The entirety of existing ocn->glc coupling was for the ice-shelf
coupling.  To better differentiate the coupling in this branch based on
thermal forcing, this commit ensures there is either a 'shelf' or 'tf'
suffix on all ocn-glc coupling variables.
  • Loading branch information
@matthewhoffman
matthewhoffman committed May 13, 2024
1 parent a91868e commit 9c40ab8
Show file tree
Hide file tree
Showing 6 changed files with 96 additions and 95 deletions.
48 changes: 24 additions & 24 deletions cime_config/config_grids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5239,15 +5239,15 @@
</gridmap>

<gridmap glc_grid="mpas.aisgis20km" ocn_grid="oEC60to30v3">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.aisgis20km_aave.190403.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.aisgis20km_bilin.190403.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.aisgis20km_aave.190403.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.aisgis20km_bilin.190403.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.aisgis20km/map_mpas.aisgis20km_to_oEC60to30v3_aave.190403.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.aisgis20km/map_mpas.aisgis20km_to_oEC60to30v3_bilin.190403.nc</map>
</gridmap>

<gridmap glc_grid="mpas.aisgis20km" ocn_grid="oEC60to30v3wLI">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_to_mpas.aisgis20km_aave.190713.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_to_mpas.aisgis20km_bilin.190713.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_to_mpas.aisgis20km_aave.190713.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_to_mpas.aisgis20km_bilin.190713.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.aisgis20km/map_mpas.aisgis20km_to_oEC60to30v3wLI_aave.190713.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.aisgis20km/map_mpas.aisgis20km_to_oEC60to30v3wLI_bilin.190713.nc</map>
</gridmap>
Expand All @@ -5264,8 +5264,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis20km" ocn_grid="oEC60to30v3">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.gis20km_aave.181115.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.gis20km_bilin.181115.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.gis20km_aave.181115.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_mpas.gis20km_bilin.181115.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_mpas.gis20km_to_oEC60to30v3_aave.181115.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_mpas.gis20km_to_oEC60to30v3_aave.181115.nc</map>
</gridmap>
Expand All @@ -5292,8 +5292,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis20km" ocn_grid="EC30to60E2r2">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_aave.230510.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_bilin.230510.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_aave.230510.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis20km_bilin.230510.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_EC30to60E2r2_aave.230510.nc</map>
Expand All @@ -5303,8 +5303,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis20km" ocn_grid="IcoswISC30E3r5">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis20km_esmfaave.20240403.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis20km_esmfbilin.20240403.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis20km_esmfaave.20240403.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis20km_esmfbilin.20240403.nc</map>
<map name="OCN2GLC_TF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis20km_esmfneareststod.20240422.deeperThan300m.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_IcoswISC30E3r5_esmfaave.20240403.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis20km/map_gis20km_to_IcoswISC30E3r5_esmfaave.20240403.nc</map>
Expand Down Expand Up @@ -5340,8 +5340,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis1to10km" ocn_grid="oEC60to30v3">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_gis1to10km_aave.200602.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_gis1to10km_bilin.200602.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_gis1to10km_aave.200602.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oEC60to30v3/map_oEC60to30v3_to_gis1to10km_bilin.200602.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_oEC60to30v3_aave.200602.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_oEC60to30v3_aave.200602.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_oEC60to30v3_aave.200602.nc</map>
Expand All @@ -5351,8 +5351,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis1to10km" ocn_grid="EC30to60E2r2">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10km_aave.210304.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10km_bilin.210304.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10km_aave.210304.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10km_bilin.210304.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_EC30to60E2r2_aave.210304.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_EC30to60E2r2_aave.210304.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10km_to_EC30to60E2r2_aave.210304.nc</map>
Expand Down Expand Up @@ -5387,8 +5387,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis1to10kmR2" ocn_grid="EC30to60E2r2">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_aave.230725.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_bilin.230725.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_aave.230725.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/EC30to60E2r2/map_EC30to60E2r2_to_gis1to10r02_bilin.230725.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10r02_to_EC30to60E2r2_aave.230725.nc</map>
Expand All @@ -5398,8 +5398,8 @@
</gridmap>

<gridmap glc_grid="mpas.gis1to10kmR2" ocn_grid="IcoswISC30E3r5">
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis1to10kmR2_esmfaave.20240403.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis1to10kmR2_esmfbilin.20240403.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis1to10kmR2_esmfaave.20240403.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/IcoswISC30E3r5/map_IcoswISC30E3r5_to_gis1to10kmR2_esmfbilin.20240403.nc</map>
<map name="GLC2ICE_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_IcoswISC30E3r5_esmfaave.20240403.nc</map>
<map name="GLC2ICE_SMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_IcoswISC30E3r5_esmfaave.20240403.nc</map>
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.gis1to10km/map_gis1to10kmR2_to_IcoswISC30E3r5_esmfaave.20240403.nc</map>
Expand Down Expand Up @@ -5526,11 +5526,11 @@

<gridmap glc_grid="mpas.ais20km" ocn_grid="oQU240">
<map name="GLC2OCN_FMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240_aave.151209.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU240/map_oQU240_to_ais20km_aave.151209.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oQU240/map_oQU240_to_ais20km_aave.151209.nc</map>
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240_nearestdtos.151209.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240_nearestdtos.151209.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU240_nearestdtos.151209.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU240/map_oQU240_to_ais20km_nearestdtos.151209.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oQU240/map_oQU240_to_ais20km_nearestdtos.151209.nc</map>
</gridmap>

<gridmap glc_grid="mpas.ais20km" ocn_grid="oQU120">
Expand All @@ -5540,8 +5540,8 @@
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oQU120_nearestdtos.160331.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_aave.160331.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_neareststod.160331.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_aave.160331.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oQU120/map_oQU120_to_ais20km_neareststod.160331.nc</map>
</gridmap>

<gridmap glc_grid="mpas.ais20km" ocn_grid="oEC60to30v3wLI">
Expand All @@ -5551,8 +5551,8 @@
<map name="GLC2OCN_SMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="GLC2OCN_LIQ_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="GLC2OCN_ICE_RMAPNAME">cpl/gridmaps/mpas.ais20km/map_ais20km_to_oEC60to30v3wLI_nomask_nearestdtos.190207.nc</map>
<map name="OCN2GLC_FMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_aave.190207.nc</map>
<map name="OCN2GLC_SMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_neareststod.190207.nc</map>
<map name="OCN2GLC_SHELF_FMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_aave.190207.nc</map>
<map name="OCN2GLC_SHELF_SMAPNAME">cpl/gridmaps/oEC60to30v3wLI/map_oEC60to30v3wLI_nomask_to_ais20km_neareststod.190207.nc</map>
</gridmap>

</gridmaps>
Expand Down
18 changes: 9 additions & 9 deletions driver-mct/cime_config/config_component.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1898,40 +1898,40 @@
<desc>glc2ocn runoff mapping file decomp type for ice runoff</desc>
</entry>

<entry id="OCN2GLC_FMAPNAME">
<entry id="OCN2GLC_SHELF_FMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc flux mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
<desc>ocn2glc shelf flux mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

<entry id="OCN2GLC_FMAPTYPE">
<entry id="OCN2GLC_SHELF_FMAPTYPE">
<type>char</type>
<valid_values>X,Y</valid_values>
<default_value>Y</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc flux mapping file decomp type</desc>
<desc>ocn2glc shelf flux mapping file decomp type</desc>
</entry>

<entry id="OCN2GLC_SMAPNAME">
<entry id="OCN2GLC_SHELF_SMAPNAME">
<type>char</type>
<default_value>idmap_ignore</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc state mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
<desc>ocn2glc shelf state mapping file - the default value idmap_ignore, if set, will be ignored by buildnml and
will generate a runtime error if in fact a file is required for the given compset</desc>
</entry>

<entry id="OCN2GLC_SMAPTYPE">
<entry id="OCN2GLC_SHELF_SMAPTYPE">
<type>char</type>
<valid_values>X,Y</valid_values>
<default_value>Y</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc state mapping file decomp type</desc>
<desc>ocn2glc shelf state mapping file decomp type</desc>
</entry>

<entry id="OCN2GLC_TF_SMAPNAME">
Expand All @@ -1949,7 +1949,7 @@
<default_value>Y</default_value>
<group>run_domain</group>
<file>env_run.xml</file>
<desc>ocn2glc state mapping file decomp type</desc>
<desc>ocn2glc thermal forcing state mapping file decomp type</desc>
</entry>

<entry id="OCN2WAV_SMAPNAME">
Expand Down
20 changes: 10 additions & 10 deletions driver-mct/cime_config/namelist_definition_drv.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4530,20 +4530,20 @@
</values>
</entry>

<entry id="ocn2glc_fmapname" modify_via_xml="OCN2GLC_FMAPNAME">
<entry id="ocn2glc_shelf_fmapname" modify_via_xml="OCN2GLC_SHELF_FMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
ocn to glc flux mapping file for fluxes
ocn to glc shelf mapping file for fluxes
</desc>
<values>
<value>$OCN2GLC_FMAPNAME</value>
<value>$OCN2GLC_SHELF_FMAPNAME</value>
</values>
</entry>

<entry id="ocn2glc_fmaptype" modify_via_xml="OCN2GLC_FMAPTYPE">
<entry id="ocn2glc_shelf_fmaptype" modify_via_xml="OCN2GLC_SHELF_FMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
Expand All @@ -4555,25 +4555,25 @@
grid.
</desc>
<values>
<value>$OCN2GLC_FMAPTYPE</value>
<value>$OCN2GLC_SHELF_FMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>

<entry id="ocn2glc_smapname" modify_via_xml="OCN2GLC_SMAPNAME">
<entry id="ocn2glc_shelf_smapname" modify_via_xml="OCN2GLC_SHELF_SMAPNAME">
<type>char</type>
<category>mapping</category>
<input_pathname>abs</input_pathname>
<group>seq_maps</group>
<desc>
ocn to glc state mapping file for states
ocn to glc shelf mapping file for states
</desc>
<values>
<value>$OCN2GLC_SMAPNAME</value>
<value>$OCN2GLC_SHELF_SMAPNAME</value>
</values>
</entry>

<entry id="ocn2glc_smaptype" modify_via_xml="OCN2GLC_SMAPTYPE">
<entry id="ocn2glc_shelf_smaptype" modify_via_xml="OCN2GLC_SHELF_SMAPTYPE">
<type>char</type>
<category>mapping</category>
<group>seq_maps</group>
Expand All @@ -4585,7 +4585,7 @@
grid.
</desc>
<values>
<value>$OCN2GLC_SMAPTYPE</value>
<value>$OCN2GLC_SHELF_SMAPTYPE</value>
<value bfbflag="on">X</value>
</values>
</entry>
Expand Down
19 changes: 10 additions & 9 deletions driver-mct/main/cime_comp_mod.F90
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,8 @@ module cime_comp_mod
logical :: lnd_c2_rof ! .true. => lnd to rof coupling on
logical :: lnd_c2_glc ! .true. => lnd to glc coupling on
logical :: ocn_c2_atm ! .true. => ocn to atm coupling on
logical :: ocn_c2_glc ! .true. => ocn to glc coupling on
logical :: ocn_c2_ice ! .true. => ocn to ice coupling on
logical :: ocn_c2_glctf ! .true. => ocn to glc thermal forcing coupling on
logical :: ocn_c2_glcshelf ! .true. => ocn to glc ice shelf coupling on
logical :: ocn_c2_wav ! .true. => ocn to wav coupling on
logical :: ocn_c2_rof ! .true. => ocn to rof coupling on
Expand Down Expand Up @@ -1732,8 +1732,9 @@ subroutine cime_init()
lnd_c2_rof = .false.
lnd_c2_glc = .false.
ocn_c2_atm = .false.
ocn_c2_glc = .false.
ocn_c2_ice = .false.
ocn_c2_glctf = .false.
ocn_c2_glcshelf = .false.
ocn_c2_wav = .false.
ocn_c2_rof = .false.
ice_c2_atm = .false.
Expand Down Expand Up @@ -1770,7 +1771,7 @@ subroutine cime_init()
if (ocn_present) then
if (atm_prognostic) ocn_c2_atm = .true.
if (atm_present ) ocn_c2_atm = .true. ! needed for aoflux calc if aoflux=atm
if (glc_prognostic) ocn_c2_glc = .true.
if (glc_prognostic) ocn_c2_glctf = .true.
if (ice_prognostic) ocn_c2_ice = .true.
if (wav_prognostic) ocn_c2_wav = .true.
if (rofocn_prognostic) ocn_c2_rof = .true.
Expand Down Expand Up @@ -1870,7 +1871,7 @@ subroutine cime_init()
write(logunit,F0L)'lnd_c2_rof = ',lnd_c2_rof
write(logunit,F0L)'lnd_c2_glc = ',lnd_c2_glc
write(logunit,F0L)'ocn_c2_atm = ',ocn_c2_atm
write(logunit,F0L)'ocn_c2_glc = ',ocn_c2_glc
write(logunit,F0L)'ocn_c2_glctf = ',ocn_c2_glctf
write(logunit,F0L)'ocn_c2_ice = ',ocn_c2_ice
write(logunit,F0L)'ocn_c2_glcshelf = ',ocn_c2_glcshelf
write(logunit,F0L)'ocn_c2_wav = ',ocn_c2_wav
Expand Down Expand Up @@ -2026,7 +2027,7 @@ subroutine cime_init()

call prep_rof_init(infodata, lnd_c2_rof, atm_c2_rof, ocn_c2_rof)

call prep_glc_init(infodata, lnd_c2_glc, ocn_c2_glc, ocn_c2_glcshelf)
call prep_glc_init(infodata, lnd_c2_glc, ocn_c2_glctf, ocn_c2_glcshelf)

call prep_wav_init(infodata, atm_c2_wav, ocn_c2_wav, ice_c2_wav)

Expand Down Expand Up @@ -4215,8 +4216,8 @@ subroutine cime_run_ocnglc_coupling()
if (glc_present) then

! create o2x_gx for either ocn-glc coupling or ocn-glc shelf coupling
if (ocn_c2_glc .or. (ocn_c2_glcshelf .and. glcshelf_c2_ocn)) then
call prep_glc_calc_o2x_gx(ocn_c2_glc, ocn_c2_glcshelf, timer='CPL:glcprep_ocn2glc') !remap ocean fields to o2x_g at ocean couping interval
if (ocn_c2_glctf .or. (ocn_c2_glcshelf .and. glcshelf_c2_ocn)) then
call prep_glc_calc_o2x_gx(ocn_c2_glctf, ocn_c2_glcshelf, timer='CPL:glcprep_ocn2glc') !remap ocean fields to o2x_g at ocean couping interval
endif

! if ice-shelf coupling is on, now proceed to handle those calculations here in the coupler
Expand Down Expand Up @@ -4350,7 +4351,7 @@ subroutine cime_run_glc_setup_send(lnd2glc_averaged_now, prep_glc_accum_avg_call
if (drv_threading) call seq_comm_setnthreads(nthreads_CPLID)

! NOTE - only create appropriate input to glc if the avg_alarm is on
if (lnd_c2_glc .or. ocn_c2_glc .or. ocn_c2_glcshelf) then
if (lnd_c2_glc .or. ocn_c2_glctf .or. ocn_c2_glcshelf) then
if (glcrun_avg_alarm) then
call prep_glc_accum_avg(timer='CPL:glcprep_avg', &
lnd2glc_averaged_now=lnd2glc_averaged_now)
Expand All @@ -4363,7 +4364,7 @@ subroutine cime_run_glc_setup_send(lnd2glc_averaged_now, prep_glc_accum_avg_call
call prep_glc_mrg_lnd(infodata, fractions_gx, timer_mrg='CPL:glcprep_mrgx2g')
endif

if (ocn_c2_glc) then
if (ocn_c2_glctf) then
! note: o2x_gx is handled in prep_glc_calc_o2x_gx, which is called
! from cime_run_ocnglc_coupling in this module
call prep_glc_mrg_ocn(infodata, fractions_gx, timer_mrg='CPL:glcprep_mrgocnx2g')
Expand Down
Loading

0 comments on commit 9c40ab8

Please sign in to comment.