From c1f5aa7142dd324c593c4180ca6ae2347a90a33e Mon Sep 17 00:00:00 2001 From: Alistair Adcroft Date: Tue, 5 Feb 2019 22:39:32 +0000 Subject: [PATCH] MOM6: Merge branch 'gustavo-marques-sync_dev_master_19Dec18' into dev/master - PR from NCAR - Also updates global_ALE/*/available_diags.000000 Changes: - NOAA-GFDL/MOM6@f9c260d Merge branch 'gustavo-marques-sync_dev_master_19Dec18' into dev/master - NOAA-GFDL/MOM6@fb27736 Fixed line lengths >120 - NOAA-GFDL/MOM6@7e76893 Proper syntax is overrated. Fix more of them. - NOAA-GFDL/MOM6@c9c88de Fix more syntax errors - NOAA-GFDL/MOM6@e67fdaf Fix syntax errors - NOAA-GFDL/MOM6@ddb73dc Rename meltw to seaice_melt and melth to seaice_melt_heat - NOAA-GFDL/MOM6@aaed093 Merge branch 'dev/master' into sync_dev_master_19Dec18 - NOAA-GFDL/MOM6@a68376b Merge pull request #88 from gustavo-marques/vectors_rotation__mct - NOAA-GFDL/MOM6@10fb249 Rotate fields from different coordinates - NOAA-GFDL/MOM6@c7121e5 Merge pull request #87 from gustavo-marques/update_mct_fluxes - NOAA-GFDL/MOM6@4b81577 Fix indices bug in ocn_import - NOAA-GFDL/MOM6@08145fe Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@dd6cb7f Merge pull request #86 from gustavo-marques/bug_fix_convert_IOB_to_forces - NOAA-GFDL/MOM6@88fd8c6 Change end do to enddo - NOAA-GFDL/MOM6@acc2ef5 Move pointer assignment outside of the loop - NOAA-GFDL/MOM6@a910cd0 Adds meltw into net_mass_src - NOAA-GFDL/MOM6@c284cdd Adds meltw and melth into FW_in and heat_in, respectively - NOAA-GFDL/MOM6@07b8936 Merge branch 'dev/ncar' into update_mct_fluxes - NOAA-GFDL/MOM6@24cdc5c Add heat_content_meltw - NOAA-GFDL/MOM6@ca03196 Merge pull request #84 from gustavo-marques/merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@3cd18ca Sets CS%ignore_fluxes_over_land = .false. when ePBL is not used - NOAA-GFDL/MOM6@622d19e Delete comment on whether meltw is needed in PRmE - NOAA-GFDL/MOM6@cd2648d Take meltw into account when adjust_net_fresh_water_to_zero=true - NOAA-GFDL/MOM6@9ede781 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@f44b215 Merge branch 'dev-master-candidate-2018-10-15' into merge-dev-master-candidate-2018-10-15 - NOAA-GFDL/MOM6@7194593 Re-introduces salt_flux contribution into net_FW - NOAA-GFDL/MOM6@6acc499 Ignores volume flux of sea ice via reverse engineering - NOAA-GFDL/MOM6@9b0af26 Adds meltw and melth into fluxes - NOAA-GFDL/MOM6@d581094 Updates MCT doxygen after adding meltw and melth - NOAA-GFDL/MOM6@918f218 Adds meltw (water flux from seaice and snow) - NOAA-GFDL/MOM6@67e70c5 Add more complete description of Fioi_meltw - NOAA-GFDL/MOM6@70779e6 Deletes TODO comments. Signs are correct. - NOAA-GFDL/MOM6@e495d0c Add heat flux term deu to melt/freeze of sea ice - NOAA-GFDL/MOM6@a3dbe02 Merge pull request #81 from gustavo-marques/fix_salt_flux - NOAA-GFDL/MOM6@a2e9c1e Merge branch 'dev/ncar' into fix_salt_flux - NOAA-GFDL/MOM6@48582eb Merge pull request #82 from NOAA-GFDL/dev/master - NOAA-GFDL/MOM6@6f12f84 Adds a missing parameter and fixes a bug --- .../global_ALE/layer/available_diags.000000 | 45 ++++++++++++++++--- .../global_ALE/z/available_diags.000000 | 45 ++++++++++++++++--- src/MOM6 | 2 +- 3 files changed, 79 insertions(+), 13 deletions(-) diff --git a/ocean_only/global_ALE/layer/available_diags.000000 b/ocean_only/global_ALE/layer/available_diags.000000 index 6d9d18ae5e..ad4f1cb428 100644 --- a/ocean_only/global_ALE/layer/available_diags.000000 +++ b/ocean_only/global_ALE/layer/available_diags.000000 @@ -4100,6 +4100,16 @@ ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "seaice_melt" [Unused] (CMOR equivalent is "fsitherm") + ! long_name: water flux to ocean from snow/sea ice melting(> 0) or formation(< 0) + ! units: kg m-2 s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics + ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "fsitherm" [Unused] (native name is "seaice_melt") + ! long_name: water flux to ocean from sea ice melt(> 0) or form(< 0) + ! units: kg m-2 s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean ! units: kg m-2 s-1 @@ -4180,6 +4190,14 @@ ! long_name: Evaporation Where Ice Free Ocean over Sea Area Integrated ! units: kg s-1 ! standard_name: water_evaporation_flux_area_integrated +"ocean_model", "total_icemelt" [Unused] + ! long_name: Area integrated sea ice melt (>0) or form (<0) + ! units: kg s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics_area_integrated +"ocean_model", "total_fsitherm" [Unused] + ! long_name: Water Melt/Form from Sea Ice Area Integrated + ! units: kg s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics_area_integrated "ocean_model", "total_precip" [Used] ! long_name: Area integrated liquid+frozen precip into ocean ! units: kg s-1 @@ -4283,6 +4301,10 @@ ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "heat_content_icemelt" [Unused] + ! long_name: Heat content (relative to 0degC) of water flux due to sea ice melting/freezing + ! units: W m-2 + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean ! units: W m-2 @@ -4314,16 +4336,16 @@ ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_coupler" [Used] - ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") - ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments + ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore+seaice_melt_heat or flux adjustments ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") - ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil + ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil+seaice_melt_heat ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean area:mean @@ -4400,6 +4422,11 @@ ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "seaice_melt_heat" [Unused] + ! long_name: Heat flux into ocean due to snow and sea ice melt/freeze + ! units: W m-2 + ! standard_name: snow_ice_melt_heat_flux + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean ! units: W m-2 @@ -4428,6 +4455,9 @@ "ocean_model", "total_heat_content_fprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of frozen precip ! units: W +"ocean_model", "total_heat_content_icemelt" [Unused] + ! long_name: Area integrated heat content (relative to 0C) of water flux due sea ice melting/freezing + ! units: W "ocean_model", "total_heat_content_vprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of virtual precip ! units: W @@ -4448,7 +4478,7 @@ ! long_name: Area integrated heat content (relative to 0C) of water entering ocean ! units: W "ocean_model", "total_net_heat_coupler" [Used] - ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W "ocean_model", "total_net_heat_surface" [Used] ! long_name: Area integrated surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments @@ -4508,11 +4538,14 @@ "ocean_model", "total_heat_adjustment" [Unused] ! long_name: Area integrated surface heat flux from restoring and/or flux adjustment ! units: W +"ocean_model", "total_seaice_melt_heat" [Unused] + ! long_name: Area integrated surface heat flux from snow and sea ice melt + ! units: W "ocean_model", "net_heat_coupler_ga" [Used] - ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W m-2 "ocean_model", "net_heat_surface_ga" [Used] - ! long_name: Area averaged surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments + ! long_name: Area averaged surface heat flux from SW+LW+lat+sens+mass+frazil+restore+seaice_melt_heat or flux adjustments ! units: W m-2 "ocean_model", "ave_hfds" [Unused] ! long_name: Surface Ocean Heat Flux from SW+LW+latent+sensible+mass transfer+frazil Area Averaged diff --git a/ocean_only/global_ALE/z/available_diags.000000 b/ocean_only/global_ALE/z/available_diags.000000 index 357ae8de30..1b0a24976d 100644 --- a/ocean_only/global_ALE/z/available_diags.000000 +++ b/ocean_only/global_ALE/z/available_diags.000000 @@ -4775,6 +4775,16 @@ ! units: kg m-2 s-1 ! standard_name: water_evaporation_flux ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "seaice_melt" [Unused] (CMOR equivalent is "fsitherm") + ! long_name: water flux to ocean from snow/sea ice melting(> 0) or formation(< 0) + ! units: kg m-2 s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics + ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "fsitherm" [Unused] (native name is "seaice_melt") + ! long_name: water flux to ocean from sea ice melt(> 0) or form(< 0) + ! units: kg m-2 s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "precip" [Unused] ! long_name: Liquid + frozen precipitation into ocean ! units: kg m-2 s-1 @@ -4855,6 +4865,14 @@ ! long_name: Evaporation Where Ice Free Ocean over Sea Area Integrated ! units: kg s-1 ! standard_name: water_evaporation_flux_area_integrated +"ocean_model", "total_icemelt" [Unused] + ! long_name: Area integrated sea ice melt (>0) or form (<0) + ! units: kg s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics_area_integrated +"ocean_model", "total_fsitherm" [Unused] + ! long_name: Water Melt/Form from Sea Ice Area Integrated + ! units: kg s-1 + ! standard_name: water_flux_into_sea_water_due_to_sea_ice_thermodynamics_area_integrated "ocean_model", "total_precip" [Used] ! long_name: Area integrated liquid+frozen precip into ocean ! units: kg s-1 @@ -4958,6 +4976,10 @@ ! long_name: Heat content (relative to 0degC) of frozen prec entering ocean ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "heat_content_icemelt" [Unused] + ! long_name: Heat content (relative to 0degC) of water flux due to sea ice melting/freezing + ! units: W m-2 + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_content_vprec" [Used] ! long_name: Heat content (relative to 0degC) of virtual precip entering ocean ! units: W m-2 @@ -4989,16 +5011,16 @@ ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_coupler" [Used] - ! long_name: Surface ocean heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W m-2 ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "net_heat_surface" [Used] (CMOR equivalent is "hfds") - ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore or flux adjustments + ! long_name: Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore+seaice_melt_heat or flux adjustments ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "hfds" [Used] (native name is "net_heat_surface") - ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil + ! long_name: Surface ocean heat flux from SW+LW+latent+sensible+masstransfer+frazil+seaice_melt_heat ! units: W m-2 ! standard_name: surface_downward_heat_flux_in_sea_water ! cell_methods: xh:mean yh:mean area:mean @@ -5075,6 +5097,11 @@ ! units: W m-2 ! standard_name: surface_downward_sensible_heat_flux ! cell_methods: xh:mean yh:mean area:mean +"ocean_model", "seaice_melt_heat" [Unused] + ! long_name: Heat flux into ocean due to snow and sea ice melt/freeze + ! units: W m-2 + ! standard_name: snow_ice_melt_heat_flux + ! cell_methods: xh:mean yh:mean area:mean "ocean_model", "heat_added" [Unused] ! long_name: Flux Adjustment or restoring surface heat flux into ocean ! units: W m-2 @@ -5103,6 +5130,9 @@ "ocean_model", "total_heat_content_fprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of frozen precip ! units: W +"ocean_model", "total_heat_content_icemelt" [Unused] + ! long_name: Area integrated heat content (relative to 0C) of water flux due sea ice melting/freezing + ! units: W "ocean_model", "total_heat_content_vprec" [Used] ! long_name: Area integrated heat content (relative to 0C) of virtual precip ! units: W @@ -5123,7 +5153,7 @@ ! long_name: Area integrated heat content (relative to 0C) of water entering ocean ! units: W "ocean_model", "total_net_heat_coupler" [Used] - ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Area integrated surface heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W "ocean_model", "total_net_heat_surface" [Used] ! long_name: Area integrated surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments @@ -5183,11 +5213,14 @@ "ocean_model", "total_heat_adjustment" [Unused] ! long_name: Area integrated surface heat flux from restoring and/or flux adjustment ! units: W +"ocean_model", "total_seaice_melt_heat" [Unused] + ! long_name: Area integrated surface heat flux from snow and sea ice melt + ! units: W "ocean_model", "net_heat_coupler_ga" [Used] - ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible (via the coupler) + ! long_name: Area averaged surface heat flux from SW+LW+latent+sensible+seaice_melt_heat (via the coupler) ! units: W m-2 "ocean_model", "net_heat_surface_ga" [Used] - ! long_name: Area averaged surface heat flux from SW+LW+lat+sens+mass+frazil+restore or flux adjustments + ! long_name: Area averaged surface heat flux from SW+LW+lat+sens+mass+frazil+restore+seaice_melt_heat or flux adjustments ! units: W m-2 "ocean_model", "ave_hfds" [Unused] ! long_name: Surface Ocean Heat Flux from SW+LW+latent+sensible+mass transfer+frazil Area Averaged diff --git a/src/MOM6 b/src/MOM6 index e6b57bace9..f9c260d47d 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit e6b57bace999d975b369eedbce1ea10f3e675604 +Subproject commit f9c260d47d1460fdc70582d159a372a0fdbc95f4