From 1eef7c54ccf5f17d7ef58b460eb512e923066ef5 Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Wed, 16 Oct 2024 16:32:47 -0500 Subject: [PATCH 1/3] Update conditionals for Southern Ocean ice and river runoff removal --- components/mpas-ocean/bld/build-namelist | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist index 460b9ecda428..69fab9d824e0 100755 --- a/components/mpas-ocean/bld/build-namelist +++ b/components/mpas-ocean/bld/build-namelist @@ -725,12 +725,22 @@ add_default($nl, 'config_sgr_salinity_prescribed'); # Namelist group: coupling # ############################ -add_default($nl, 'config_remove_ais_river_runoff'); -if (($OCN_ICEBERG eq 'true') && ($OCN_FORCING eq 'active_atm')) { +# Assume ice runoff corresponds to icebergs in Southern Ocean (true for JRA +# forcing, perhaps modeled firn ice runoff approximates icebergs). +if ($OCN_ICEBERG eq 'true') { add_default($nl, 'config_remove_ais_ice_runoff', 'val'=>".true."); } else { add_default($nl, 'config_remove_ais_ice_runoff', 'val'=>".false."); } +# Assume river runoff corresponds to ISMF in Southern Ocean only for G-cases +# (true for JRA). When atm active, we assume liquid runoff corresonds to precip +# or snow melt so we do not remove it. In either case, the energy for melting +# doesn't come from the ocean. +if (($OCN_ISMF ne 'none') && ($OCN_FORCING ne 'active_atm')) { + add_default($nl, 'config_remove_ais_river_runoff', 'val'=>".true."); +} else { + add_default($nl, 'config_remove_ais_river_runoff', 'val'=>".false."); +} ###################################### # Namelist group: shortwaveRadiation # From 83dc8ca2459dfa01f41686e71b33b171397555ab Mon Sep 17 00:00:00 2001 From: Carolyn Begeman Date: Thu, 17 Oct 2024 12:44:13 -0600 Subject: [PATCH 2/3] Update components/mpas-ocean/bld/build-namelist --- components/mpas-ocean/bld/build-namelist | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/mpas-ocean/bld/build-namelist b/components/mpas-ocean/bld/build-namelist index 69fab9d824e0..e38ba0772288 100755 --- a/components/mpas-ocean/bld/build-namelist +++ b/components/mpas-ocean/bld/build-namelist @@ -725,8 +725,7 @@ add_default($nl, 'config_sgr_salinity_prescribed'); # Namelist group: coupling # ############################ -# Assume ice runoff corresponds to icebergs in Southern Ocean (true for JRA -# forcing, perhaps modeled firn ice runoff approximates icebergs). +# When we have a data representation of icebergs, remove ice runoff if ($OCN_ICEBERG eq 'true') { add_default($nl, 'config_remove_ais_ice_runoff', 'val'=>".true."); } else { From 238536c739591cd064af8058527cf3efb526d20d Mon Sep 17 00:00:00 2001 From: Darin Comeau Date: Tue, 22 Oct 2024 18:04:43 -0500 Subject: [PATCH 3/3] Removing drof modes that point to modified runoff forcing files; modified G-case compsets that were using these drof modes --- .../drof/cime_config/config_component.xml | 24 +----- .../cime_config/namelist_definition_drof.xml | 86 ------------------- .../cime_config/config_compsets.xml | 46 +++++----- 3 files changed, 25 insertions(+), 131 deletions(-) diff --git a/components/data_comps/drof/cime_config/config_component.xml b/components/data_comps/drof/cime_config/config_component.xml index aede006caf26..1c0052d93644 100644 --- a/components/data_comps/drof/cime_config/config_component.xml +++ b/components/data_comps/drof/cime_config/config_component.xml @@ -13,24 +13,14 @@ --> - Data runoff model + Data runoff model NULL mode COREv2 normal year forcing: - COREv2 normal year forcing: - COREv2 normal year forcing: - COREv2 normal year forcing: COREv2 interannual year forcing: - COREv2 interannual year forcing: - COREv2 interannual year forcing: - COREv2 interannual year forcing: CPLHIST mode: JRA55 interannual forcing, v1.5, through 2023 JRA55 interannual forcing, v1.5, through 2020 - JRA55 interannual forcing, v1.5, through 2020, no rofi or rofl around AIS JRA55 interannual forcing, v1.4, through 2018 - JRA55 interannual forcing, v1.4, through 2018, no rofi around AIS - JRA55 interannual forcing, v1.4, through 2018, no rofl around AIS - JRA55 interannual forcing, v1.4, through 2018, no rofi or rofl around AIS JRA55 interannual forcing JRA55 Repeat Year Forcing v1.3 1984-1985 JRA55 Repeat Year Forcing v1.3 1990-1991 @@ -48,27 +38,17 @@ char - CPLHIST,DIATREN_ANN_RX1,DIATREN_ANN_AIS00_RX1,DIATREN_ANN_AIS45_RX1,DIATREN_ANN_AIS55_RX1,DIATREN_IAF_RX1,DIATREN_IAF_AIS00_RX1,DIATREN_IAF_AIS45_RX1,DIATREN_IAF_AIS55_RX1,IAF_JRA,IAF_JRA_1p5,IAF_JRA_1p5_AIS0ROF,IAF_JRA_1p4_2018,IAF_JRA_1p4_2018_AIS0ICE,IAF_JRA_1p4_2018_AIS0LIQ,IAF_JRA_1p4_2018_AIS0ROF,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL + CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,IAF_JRA,IAF_JRA_1p5,IAF_JRA_1p4_2018,RYF8485_JRA,RYF9091_JRA,RYF0304_JRA,NULL DIATREN_ANN_RX1 NULL DIATREN_ANN_RX1 - DIATREN_ANN_AIS00_RX1 - DIATREN_ANN_AIS45_RX1 - DIATREN_ANN_AIS55_RX1 DIATREN_IAF_RX1 - DIATREN_IAF_AIS00_RX1 - DIATREN_IAF_AIS45_RX1 - DIATREN_IAF_AIS55_RX1 CPLHIST IAF_JRA IAF_JRA_1p5 IAF_JRA_1p5 - IAF_JRA_1p5_AIS0ROF IAF_JRA_1p4_2018 - IAF_JRA_1p4_2018_AIS0ICE - IAF_JRA_1p4_2018_AIS0LIQ - IAF_JRA_1p4_2018_AIS0ROF RYF8485_JRA RYF9091_JRA RYF0304_JRA diff --git a/components/data_comps/drof/cime_config/namelist_definition_drof.xml b/components/data_comps/drof/cime_config/namelist_definition_drof.xml index c4139552c706..d4d70074596a 100644 --- a/components/data_comps/drof/cime_config/namelist_definition_drof.xml +++ b/components/data_comps/drof/cime_config/namelist_definition_drof.xml @@ -52,18 +52,8 @@ NULL rof.cplhist rof.diatren_ann_rx1 - rof.diatren_ann_ais00_rx1 - rof.diatren_ann_ais45_rx1 - rof.diatren_ann_ais55_rx1 rof.diatren_iaf_rx1 - rof.diatren_iaf_ais00_rx1 - rof.diatren_iaf_ais45_rx1 - rof.diatren_iaf_ais55_rx1 - rof.iaf_jra_1p4_2018_ais0ice - rof.iaf_jra_1p4_2018_ais0liq - rof.iaf_jra_1p4_2018_ais0rof rof.iaf_jra_1p4_2018 - rof.iaf_jra_1p5_ais0rof rof.iaf_jra_1p5 rof.iaf_jra rof.ryf8485_jra @@ -80,13 +70,7 @@ $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/lnd/dlnd7/JRA55 $DIN_LOC_ROOT/lnd/dlnd7/JRA55 $DIN_LOC_ROOT/lnd/dlnd7/JRA55 @@ -101,13 +85,7 @@ Stream domain file path(s). runoff.daitren.annual.20190226.nc - runoff.daitren.annual-AISx00.20190226.nc - runoff.daitren.annual-AISx45.20190226.nc - runoff.daitren.annual-AISx55.20190226.nc runoff.daitren.iaf.20120419.nc - runoff.daitren.iaf-AISx00.20120419.nc - runoff.daitren.iaf-AISx45.20120419.nc - runoff.daitren.iaf-AISx55.20120419.nc domain.roff.JRA025.170111.nc domain.roff.JRA025.170111.nc null @@ -134,27 +112,6 @@ arear area mask mask - - time time - xc lon - yc lat - arear area - mask mask - - - time time - xc lon - yc lat - arear area - mask mask - - - time time - xc lon - yc lat - arear area - mask mask - time time domrb_lon lon @@ -173,13 +130,7 @@ $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 - $DIN_LOC_ROOT/lnd/dlnd7/RX1 $DIN_LOC_ROOT/ocn/jra55/v1.5_noleap $DIN_LOC_ROOT/lnd/dlnd7/JRA55 $DIN_LOC_ROOT/lnd/dlnd7/JRA55 @@ -194,31 +145,13 @@ Stream data file path(s). runoff.daitren.annual.20190226.nc - runoff.daitren.annual.20190226.nc - runoff.daitren.annual.20190226.nc - runoff.daitren.annual.20190226.nc runoff.daitren.iaf.20120419.nc - runoff.daitren.iaf-AISx00.20120419.nc - runoff.daitren.iaf-AISx45.20120419.nc - runoff.daitren.iaf-AISx55.20120419.nc RAF_8485.JRA.v1.3.runoff.180404.nc RAF_9091.JRA.v1.3.runoff.180404.nc RAF_0304.JRA.v1.3.runoff.180404.nc - - JRA.v1.5.runoff.%y.no_rofi_no_rofl.240411.nc - JRA.v1.5.runoff.%y.240411.nc - - JRA.v1.4.runoff.%y.no_rofi.190214.nc - - - JRA.v1.4.runoff.%y.no_rofl.190214.nc - - - JRA.v1.4.runoff.%y.no_rofi_no_rofl.190214.nc - JRA.v1.4.runoff.%y.190214.nc @@ -244,9 +177,6 @@ runoff rofl - - runoff rofl - rofl rofl rofi rofi @@ -282,7 +212,6 @@ 1 1 1 - 1 $DROF_STRM_YR_ALIGN $DROF_STRM_YR_ALIGN $DROF_CPLHIST_YR_ALIGN @@ -296,13 +225,7 @@ First year of stream. 1 - 1 - 1 - 1 1948 - 1948 - 1948 - 1948 $DROF_STRM_YR_START 1984 1990 @@ -318,18 +241,9 @@ Last year of stream. 1 - 1 - 1 - 1 2009 - 2009 - 2009 - 2009 $DROF_STRM_YR_END $DROF_STRM_YR_END - $DROF_STRM_YR_END - $DROF_STRM_YR_END - $DROF_STRM_YR_END $DROF_STRM_YR_END 1984 1990 diff --git a/components/mpas-ocean/cime_config/config_compsets.xml b/components/mpas-ocean/cime_config/config_compsets.xml index 52ad20a5ab7c..62c87ddea3fd 100644 --- a/components/mpas-ocean/cime_config/config_compsets.xml +++ b/components/mpas-ocean/cime_config/config_compsets.xml @@ -34,17 +34,17 @@ GMPAS-NYF-PISMF - 2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%NYF_SGLC_SWAV GMPAS-NYF-PISMF-DSGR - 2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCEDDSGR_DROF%NYFAIS45_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI_MPASO%PISMFDATMFORCEDDSGR_DROF%NYF_SGLC_SWAV GMPAS-NYF-DISMF - 2000_DATM%NYF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%NYFAIS45_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%NYF_SGLC_SWAV @@ -94,27 +94,27 @@ GMPAS-JRA1p5-DIB-PISMF - 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p5_SGLC_SWAV GMPAS-JRA1p5-DIB-PISMF-DSGR - 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDDSGR_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDDSGR_DROF%JRA-1p5_SGLC_SWAV GMPAS-JRA1p5-DIB-PISMF-DSGR-TMIX - 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDDSGRTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDDSGRTMIX_DROF%JRA-1p5_SGLC_SWAV GMPAS-JRA1p5-DIB-DISMF - 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p5_SGLC_SWAV GMPAS-JRA1p5-DIB-PISMF-TMIX - 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p5-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p5_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCEDTMIX_DROF%JRA-1p5_SGLC_SWAV @@ -124,77 +124,77 @@ GMPAS-JRA1p4-PISMF - 2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV + 2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV GMPAS-JRA1p4-DISMF - 2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0LIQ_SGLC_SWAV + 2000_DATM%JRA-1p4-2018_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV GMPAS-JRA1p4-DIB - 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%JRA-1p4-2018-AIS0ICE_SGLC_SWAV + 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV GMPAS-JRA1p4-DIB-PISMF - 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV GMPAS-JRA1p4-DIB-DISMF - 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018-AIS0ROF_SGLC_SWAV + 2000_DATM%JRA-1p4-2018_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%JRA-1p4-2018_SGLC_SWAV GMPAS-IAF-PISMF - 2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV + 2000_DATM%IAF_SLND_MPASSI_MPASO%PISMFDATMFORCED_DROF%IAF_SGLC_SWAV GMPAS-IAF-DISMF - 2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAFAIS45_SGLC_SWAV + 2000_DATM%IAF_SLND_MPASSI_MPASO%DISMFDATMFORCED_DROF%IAF_SGLC_SWAV GMPAS-DIB-NYF - 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYFAIS55_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%NYF_SGLC_SWAV GMPAS-DIB-NYF-PISMF - 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%NYF_SGLC_SWAV GMPAS-DIB-NYF-DISMF - 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%NYFAIS00_SGLC_SWAV + 2000_DATM%NYF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%NYF_SGLC_SWAV GMPAS-DIB-IAF - 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%IAFAIS55_SGLC_SWAV + 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDATMFORCED_DROF%IAF_SGLC_SWAV GMPAS-DIB-IAF-PISMF - 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV + 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBPISMFDATMFORCED_DROF%IAF_SGLC_SWAV GMPAS-DIB-IAF-DISMF - 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAFAIS00_SGLC_SWAV + 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFDATMFORCED_DROF%IAF_SGLC_SWAV GMPAS-MALI-DIB-IAF-DISMF - 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV + 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAF_MALI%SIASTATIC_SWAV GMPAS-MALI-DIB-IAF-DISMF - 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAFAIS00_MALI%SIASTATIC_SWAV + 2000_DATM%IAF_SLND_MPASSI%DIB_MPASO%IBDISMFCOREFORCED_DROF%IAF_MALI%SIASTATIC_SWAV