Skip to content

Commit

Permalink
MOM6: Merge pull request mom-ocean#618 from adcroft/cell_measure_volc…
Browse files Browse the repository at this point in the history 
…ello

- NOAA-GFDL/MOM6@60ce41f Merge pull request mom-ocean#618 from adcroft/cell_measure_volcello
- NOAA-GFDL/MOM6@625a3a0 Register volcello as volume cell measure
- NOAA-GFDL/MOM6@4986283 Provides means for associate cell measure "volume"
- NOAA-GFDL/MOM6@7add3b8 Adds diagnostic field "volcello"
- NOAA-GFDL/MOM6@8305575 Merge pull request mom-ocean#616 from ashao/fix_diag_remap_index_range
- NOAA-GFDL/MOM6@c181210 Fix i,j range when updating diagnostic grids
  • Loading branch information
@adcroft
adcroft committed Sep 27, 2017
1 parent 5e48ccd commit 7f94c58
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 2 deletions.
25 changes: 24 additions & 1 deletion ice_ocean_SIS2/OM4_025/diag_table.MOM6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@
# -----------------------------------------------------------------------------------------
# CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD
# Generally save annuals, and sometimes monthly and daily.
"ocean_model_z", "volcello", "volcello", "ocean_annual_z", "all", "mean", "none",2 # Cell measure for 3d data
"ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 # Cell measure for 3d data
"ocean_model", "volcello", "volcello", "ocean_annual", "all", "mean", "none",2 # Cell measure for 3d data
#"ocean_model", "volcello", "volcello", "ocean_month", "all", "mean", "none",2 # Cell measure for 3d data
"ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2
"ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2
"ocean_model", "pso", "pso", "ocean_annual", "all", "mean", "none",2
Expand Down Expand Up @@ -220,114 +224,133 @@
# C/ Can use these sections for post-processing diagnostics to fill OMIP Table 2.4.

# Barents Opening (north-south section)
"ocean_model_z", "thetao", "theta", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2
"ocean_model_z", "volcello", "volcello", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Barents_opening", "all", "mean", "6. 6. 62. 80.2 -1 -1",2

# Bering Strait (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Bering_Strait", "all", "mean", "-171.4 -168.7 66.1 66.1 -1 -1",2

# Caribbean (east-west section, Cuba-Haiti) Windward Passage
"ocean_model_z", "volcello", "volcello", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Windward_Passage", "all", "mean", "-75.0 -72.5 19.96 19.96 -1 -1",2

# Approximate section to capture outflow of Arctic through Davis Strait (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Davis_Strait", "all", "mean", "-65.0 -48.0 66.0 66.0 -1 -1",2

# Approximate section to capture flow across Denmark Strait (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Denmark_Strait", "all", "mean", "-42.5 -20. 65. 65. -1 -1",2

# Approximate section to capture flow through Drake Passage (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Drake_Passage", "all", "mean", "-70. -70. -71. -54.5 -1 -1",2

# English channel flow (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2
"ocean_model_z", "so", "so", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_English_Channel", "all", "mean", "2.16 2.16 50.8 51.2 -1 -1",2

# Faroe-Scotland flow (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Faroe_Scotland", "all", "mean", "-6.3 -6.3 58. 61.5 -1 -1",2

# Florida-Bahamas Strait (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Florida_Bahamas", "all", "mean", "-80.5 -77.8 25. 25. -1 -1",2

# Fram Strait (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Fram_Strait", "all", "mean", "-22. 0.0 81.2 81.2 -1 -1",2

# Gibraltar Strait (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Gibraltar_Strait", "all", "mean", "-5. -5. 35.8 36.2 -1 -1",2

# Iceland-Faroe flow: 1st part of zig-zag for flow moving north/south; specific settings for OM4
"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Iceland_Faroe_V", "all", "mean", "-17.89 -6. 62.25 62.25 -1 -1",2

# Iceland-Faroe flow: 2nd part of zig-zag for flow moving east/west; specific settings for OM4
"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Iceland_Faroe_U", "all", "mean", "-17.74 -17.74 62.31 63.6 -1 -1",2

# Indonesian Throughflow (east-west section): settings in spirit of OMIP "bulk" transport calculation
"ocean_model_z", "volcello", "volcello", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Indonesian_Throughflow", "all", "mean", "-246.0 -220.0 -8.1 -8.1 -1 -1",2

# Mozambique Channel (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2
"ocean_model_z", "vo", "vo", "ocean_Mozambique_Channel", "all", "mean", "39. 46. -16. -16. -1 -1",2

# Pacific Equatorial Undercurrent (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Pacific_undercurrent", "all", "mean", "-155. -155. -2. 2. -1 -1",2

# Taiwan-Luzon (north-south section)
"ocean_model_z", "volcello", "volcello", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Taiwan_Luzon", "all", "mean", "-239.5 -239.5 17. 23. -1 -1",2

# Agulhas section (north-south section; transport is closely tied to Drake Passage transport)
"ocean_model_z", "volcello", "volcello", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2
"ocean_model_z", "thetao", "thetao", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2
"ocean_model_z", "so", "so", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2
"ocean_model_z", "umo", "umo", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2
"ocean_model_z", "uo", "uo", "ocean_Agulhas_section", "all", "mean", "20. 20. -71.0 -34 -1 -1",2

# Iceland-Norway (east-west section)
"ocean_model_z", "volcello", "volcello", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2
"ocean_model_z", "thetao","thetao", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2
"ocean_model_z", "so", "so", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2
"ocean_model_z", "vmo", "vmo", "ocean_Iceland_Norway", "all", "mean", "-20. 15. 65. 65. -1 -1",2
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_025/diag_table.MOM6_spinup
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@
# -----------------------------------------------------------------------------------------
# CMIP6/OMIP Table H1: scalar fields such as tracers, cell mass/volume, sea level, MLD
# Generally save annuals, and sometimes monthly and daily.
#"ocean_model_z", "volcello", "volcello", "ocean_annual_z", "all", "mean", "none",2 # Cell measure for 3d data
#"ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 # Cell measure for 3d data
#"ocean_model", "volcello", "volcello", "ocean_annual", "all", "mean", "none",2 # Cell measure for 3d data
#"ocean_model", "volcello", "volcello", "ocean_month", "all", "mean", "none",2 # Cell measure for 3d data
"ocean_model", "pbo", "pbo", "ocean_annual", "all", "mean", "none",2
#"ocean_model", "pbo", "pbo", "ocean_month", "all", "mean", "none",2
"ocean_model", "pso", "pso", "ocean_annual", "all", "mean", "none",2
Expand Down
20 changes: 20 additions & 0 deletions ocean_only/global_ALE/layer/available_diags.000000
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,26 @@
! long_name: Sea Area Fraction
! units: %
! standard_name: SeaAreaFraction
"ocean_model", "volcello" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: xh:sum yh:sum zl:sum
"ocean_model", "volcello_xyave" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: zl:sum
"ocean_model_z", "volcello" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: xh:sum yh:sum z_l:sum
"ocean_model_z", "volcello_xyave" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: z_l:sum
"ocean_model", "MEKE" [Used]
! long_name: Mesoscale Eddy Kinetic Energy
! units: m2 s-2
Expand Down
20 changes: 20 additions & 0 deletions ocean_only/global_ALE/z/available_diags.000000
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,26 @@
! long_name: Sea Area Fraction
! units: %
! standard_name: SeaAreaFraction
"ocean_model", "volcello" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: xh:sum yh:sum zl:sum
"ocean_model", "volcello_xyave" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: zl:sum
"ocean_model_z", "volcello" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: xh:sum yh:sum z_l:sum
"ocean_model_z", "volcello_xyave" [Unused]
! long_name: Ocean grid-cell volume
! units: m3
! standard_name: ocean_volume
! cell_methods: z_l:sum
"ocean_model", "MEKE" [Used]
! long_name: Mesoscale Eddy Kinetic Energy
! units: m2 s-2
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 5 files
+19 −0 src/core/MOM.F90
+34 −47 src/diagnostics/MOM_diagnostics.F90
+5 −3 src/framework/MOM_diag_manager_wrapper.F90
+72 −16 src/framework/MOM_diag_mediator.F90
+2 −2 src/framework/MOM_diag_remap.F90

0 comments on commit 7f94c58

Please sign in to comment.