Skip to content

Commit

Permalink
Merge branch 'dev/master' into dev/gfdl
Browse files Browse the repository at this point in the history 
Resovled conflicts:
- ocean_only/global_ALE/layer/available_diags.000000
- ocean_only/global_ALE/z/available_diags.000000

MOM6 commits inside merge of dev/master to dev/gfdl:
- NOAA-GFDL/MOM6@6dd6f52 Merge branch 'dev/master' into dev/gfdl
- 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@c401055 Merge pull request #886 from Hallberg-NOAA/unit_rescale_comments
- 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@06631bd Documented 93 thermodynamic variable units
- NOAA-GFDL/MOM6@dea748a Documented 170 variable units
- NOAA-GFDL/MOM6@ea5c097 Documented 116 tracer variable units
- NOAA-GFDL/MOM6@bf1fa4b Documented 288 parameterization variable units
- NOAA-GFDL/MOM6@c2473a7 Documented 300 miscellaneous variable units
- NOAA-GFDL/MOM6@026f7d8 Documented units of 50 grid variables
- NOAA-GFDL/MOM6@00b3289 Documented units of 110 core variables
- NOAA-GFDL/MOM6@3d0c946 Documented units of 280 more variables
- NOAA-GFDL/MOM6@e0c3d49 Documented temperature variable units
- NOAA-GFDL/MOM6@6976ac6 Documented density variable units
- NOAA-GFDL/MOM6@78e9659 Documented miscellaneous variable units
- NOAA-GFDL/MOM6@00a8cdc dOxyGenize ice_solo_driver/MOM_surface_forcing.F90
- NOAA-GFDL/MOM6@17c4608 Document frequency units with square brackets
- NOAA-GFDL/MOM6@dd34d00 Document velocity units with square brackets
- NOAA-GFDL/MOM6@23eea80 Document more variable units with square brackets
- NOAA-GFDL/MOM6@e424e0b Document additional thickness variable units
- NOAA-GFDL/MOM6@9df0655 Use square-brackets in thickness documentation
- NOAA-GFDL/MOM6@aaed093 Merge branch 'dev/master' into sync_dev_master_19Dec18
- NOAA-GFDL/MOM6@ad18eaf Use square-brackets in height documentation
- NOAA-GFDL/MOM6@7dab975 Updated comments explaining the '~>' notation
- NOAA-GFDL/MOM6@0e2066d Use square-bracket syntax in unit documentation
- 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@c2d6ff1 Further reduced use of square brackets in comments
- NOAA-GFDL/MOM6@53f947c Reduced use of square brackets in comments
- NOAA-GFDL/MOM6@c7121e5 Merge pull request #87 from gustavo-marques/update_mct_fluxes
- NOAA-GFDL/MOM6@80b7ba9 Extended comments to clarify H units
- NOAA-GFDL/MOM6@f8ee1e6 Renamed internal variables in EF4
- NOAA-GFDL/MOM6@83b410d Added comments explaining the '~>' notation
- 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@62709d7 Extended comments to clarify Z units
- NOAA-GFDL/MOM6@47a3574 Merge pull request #885 from nikizadehgfdl/nikizadehgfdl/fix_compile_generics
- NOAA-GFDL/MOM6@16d0745 This update fixes compilation issues of ESM
- NOAA-GFDL/MOM6@28a83f1 Merge branch 'Hallberg-NOAA-rescale_topography' into dev/gfdl
- NOAA-GFDL/MOM6@27e3a1d Merge branch 'rescale_topography' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-rescale_topography
- NOAA-GFDL/MOM6@378eb63 Merge branch 'Hallberg-NOAA-eliminate_Zd_to_m' into dev/gfdl
- NOAA-GFDL/MOM6@50d1aeb Merge branch 'eliminate_Zd_to_m' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-eliminate_Zd_to_m
- NOAA-GFDL/MOM6@2925a58 Merge branch 'MFJansen-dev/gfdl' into dev/gfdl
- NOAA-GFDL/MOM6@07b8936 Merge branch 'dev/ncar' into update_mct_fluxes
- NOAA-GFDL/MOM6@24cdc5c Add heat_content_meltw
- NOAA-GFDL/MOM6@5e5e315 Adds random noise option for Neverland IC
- NOAA-GFDL/MOM6@45a6400 Added run-time parameter for Neverland perturbation
- NOAA-GFDL/MOM6@de69ac0 Merge branch 'dev/gfdl' of https://github.com/MFJansen/MOM6 into MFJansen-dev/gfdl
- NOAA-GFDL/MOM6@604a716 Rescale topography during initialization
- NOAA-GFDL/MOM6@bc808be +Rescale topography in MOM_shared_initialization
- NOAA-GFDL/MOM6@74014e7 Better comments in initialize_topography routines
- NOAA-GFDL/MOM6@c9517fe +Rescale depth in USER_initialize_topography
- NOAA-GFDL/MOM6@8560c62 +Rescale depth in shelfwave_initialize_topography
- NOAA-GFDL/MOM6@c40b482 +Rescale depth in benchmark_initialize_topography
- NOAA-GFDL/MOM6@e543439 +Rescale depth in Phillips_initialize_topography
- NOAA-GFDL/MOM6@f272edc +Rescale depth in Kelvin_initialize_topography
- NOAA-GFDL/MOM6@771e44f +Rescale depth in ISOMIP_initialize_topography
- NOAA-GFDL/MOM6@a1653f6 +Rescale depth in DOME_initialize_topography
- NOAA-GFDL/MOM6@f909e93 Merge branch 'dev/gfdl' into eliminate_Zd_to_m
- NOAA-GFDL/MOM6@7f73764 +Recast ustar_gustless into Z/s
- NOAA-GFDL/MOM6@5810cf0 Recast internal MOM_barotropic variables into Z
- NOAA-GFDL/MOM6@fac1464 +Eliminated Zd_to_m from grid types
- NOAA-GFDL/MOM6@3d4c891 +Add optional unit_scale_type arg to initialize_masks
- NOAA-GFDL/MOM6@6c47801 +Add unit_scale_type arg to MOM_sum_output_init
- NOAA-GFDL/MOM6@366efc8 +Add unit_scale_type arg to MOM_initialize_fixed
- NOAA-GFDL/MOM6@d2bfd73 +Add unit_scale_type argument to diag_remap_update
- NOAA-GFDL/MOM6@47909a1 Added perturbations to initial layer thicknesses in Neverland
- NOAA-GFDL/MOM6@9ac67cc +Add unit_scale_type argument to tracer_Z_init
- NOAA-GFDL/MOM6@967e470 +Rescaled variables in MOM_tidal_mixing
- NOAA-GFDL/MOM6@375bab5 +Rescaled variables in MOM_internal_tides
- NOAA-GFDL/MOM6@dcdc509 +Add US arg to set_up_ALE_sponge_vel_field_varying
- 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
  • Loading branch information
@adcroft
adcroft committed Feb 7, 2019
2 parents c890333 + c1f5aa7 commit 18ca692
Show file tree
Hide file tree
Showing 3 changed files with 79 additions and 13 deletions.
45 changes: 39 additions & 6 deletions ocean_only/global_ALE/layer/available_diags.000000
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4116,6 +4116,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
Expand Down Expand Up @@ -4196,6 +4206,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
Expand Down Expand Up @@ -4299,6 +4317,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
Expand Down Expand Up @@ -4330,16 +4352,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
Expand Down Expand Up @@ -4416,6 +4438,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" [Used]
! long_name: Flux Adjustment or restoring surface heat flux into ocean
! units: W m-2
Expand Down Expand Up @@ -4444,6 +4471,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
Expand All @@ -4464,7 +4494,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
Expand Down Expand Up @@ -4524,11 +4554,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
Expand Down
45 changes: 39 additions & 6 deletions ocean_only/global_ALE/z/available_diags.000000
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4791,6 +4791,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
Expand Down Expand Up @@ -4871,6 +4881,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
Expand Down Expand Up @@ -4974,6 +4992,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
Expand Down Expand Up @@ -5005,16 +5027,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
Expand Down Expand Up @@ -5091,6 +5113,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" [Used]
! long_name: Flux Adjustment or restoring surface heat flux into ocean
! units: W m-2
Expand Down Expand Up @@ -5119,6 +5146,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
Expand All @@ -5139,7 +5169,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
Expand Down Expand Up @@ -5199,11 +5229,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
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 161 files

0 comments on commit 18ca692

Please sign in to comment.