Merge pull request mom-ocean#132 from NOAA-GFDL/user/smg/diag_table_u…

…pdates User/smg/diag table updates
nikizadehgfdl · Jun 7, 2017 · 3c9e098 · 3c9e098
2 parents 76288b0 + 265cb2b
commit 3c9e098
Show file tree

Hide file tree

Showing 2 changed files with 596 additions and 3 deletions.
diff --git a/ice_ocean_SIS2/OM4_025/diag_table.MOM6 b/ice_ocean_SIS2/OM4_025/diag_table.MOM6
@@ -37,7 +37,7 @@
  "ocean_model", "areacello",   "areacello",   "ocean_static", "all", "none", "none", 2
  "ocean_model", "deptho",      "deptho",      "ocean_static", "all", "none", "none", 2
 #"ocean_model", "basin",       "basin",       "ocean_static", "all", "none", "none", 2  # in /archive/gold/datasets/OM4_025/
- "ocean_model", "hfgeou",      "hfgeou"       "ocean_static", "all", "none", "none", 2  # for geothermal heat
+ "ocean_model", "hfgeou",      "hfgeou"       "ocean_static", "all", "none", "none", 2  # for static geothermal heat
 
 # Extra static geometry data beyond CMIP6/OMIP Table 2.1
  "ocean_model", "Coriolis",    "Coriolis",    "ocean_static", "all", "none", "none", 2
@@ -344,7 +344,7 @@
 
 # -----------------------------------------------------------------------------------------
 # CMIP6/OMIP Table K3: boundary heat fluxes
-#"ocean_model",  "hfgeou",          "hfgeou",           "ocean_annual",       "all", "mean", "none",2  # geothermal heat flux
+# "ocean_model",  "hfgeou",          "hfgeou",           "ocean_annual",       "all", "mean", "none",2  # geothermal heat flux is static 
  "ocean_model",  "hfrainds",        "hfrainds",         "ocean_annual",       "all", "mean", "none",2
  "ocean_model",  "hfevapds",        "hfevapds",         "ocean_annual",       "all", "mean", "none",2
  "ocean_model",  "hfrunoffds",      "hfrunoffds",       "ocean_annual",       "all", "mean", "none",2
@@ -359,7 +359,7 @@
  "ocean_model",  "rsdo",            "rsdo"              "ocean_annual",       "all", "mean", "none",2
  "ocean_model",  "hfds",            "hfds"              "ocean_annual",       "all", "mean", "none",2
 
-#"ocean_model",  "hfgeou",          "hfgeou",           "ocean_month",        "all", "mean", "none",2  # geothermal heat flux
+# "ocean_model",  "hfgeou",          "hfgeou",           "ocean_month",        "all", "mean", "none",2  # geothermal heat flux is static 
  "ocean_model",  "hfrainds",        "hfrainds",         "ocean_month",        "all", "mean", "none",2  # heat content of lprec,fprec,condensate
  "ocean_model",  "hfevapds",        "hfevapds",         "ocean_month",        "all", "mean", "none",2  # heat content of mass leaving ocean
  "ocean_model",  "hfrunoffds",      "hfrunoffds",       "ocean_month",        "all", "mean", "none",2  # heat content of lrunoff,frunoff