From 1c20d6166ddc3b2b849b3bb98c2c971eabbeb3b5 Mon Sep 17 00:00:00 2001 From: ashjbarnes Date: Thu, 18 Jan 2024 12:06:49 +1100 Subject: [PATCH] add new executable to config.yaml and tidy up diagnostic table --- .../common_files/config.yaml | 4 +- .../common_files/diag_table | 46 ++----------------- 2 files changed, 7 insertions(+), 43 deletions(-) diff --git a/demos/premade_run_directories/common_files/config.yaml b/demos/premade_run_directories/common_files/config.yaml index cee0fde2..5851056d 100755 --- a/demos/premade_run_directories/common_files/config.yaml +++ b/demos/premade_run_directories/common_files/config.yaml @@ -10,7 +10,9 @@ model: mom6 input: - path_to_input_files -exe: /g/data/v45/ab8992/mom_executables/dec-23-build +## Executable that Ashley uses on nci. If you're an NCI user hopefully you can access this +exe: /g/data/v45/ab8992/mom_executables/jan2024-latest-everything + collate: false #runlog: true storage: diff --git a/demos/premade_run_directories/common_files/diag_table b/demos/premade_run_directories/common_files/diag_table index dcca42a7..56ba392b 100755 --- a/demos/premade_run_directories/common_files/diag_table +++ b/demos/premade_run_directories/common_files/diag_table @@ -1,16 +1,10 @@ +mom6-regional +2003 1 1 0 0 0 + "ocean_daily", 1, "days", 1, "days", "time" -"ocean_month", 1, "months", 1, "days", "time" -"ocean_month_z", 1, "months", 1, "days", "time" -# "ocean_month_rho2", 1, "months", 1, "days", "time" "ocean_static", -1, "months", 1, "days", "time" # ocean_static is a protected name. Do not change this line. -"ice_daily", 1, "days", 1, "days", "time" -"ice_month", 1, "months", 1, "days", "time" - -# Ocean grid-cell volume -"ocean_model_z", "volcello", "volcello", "ocean_month_z", "all", "mean", "none",2 -# "ocean_model_rho2", "volcello", "volcello", "ocean_month_rho2", "all", "mean", "none",2 -# Sea surface height above geoid +# Sea Surface Height "ocean_model", "zos", "zos", "ocean_daily", "all", "mean", "none",2 # Sea Surface Temperature "ocean_model", "tos", "tos", "ocean_daily", "all", "mean", "none",2 @@ -25,34 +19,6 @@ # Sea Surface Speed "ocean_model", "speed", "speed", "ocean_daily", "all", "mean", "none",2 -# (umo,vmo) =net mass transport from residual mean velocity (model resolved + SGS) -# "ocean_model_rho2","umo", "umo", "ocean_month_rho2", "all", "mean", "none",2 -# "ocean_model_rho2","vmo", "vmo", "ocean_month_rho2", "all", "mean", "none",2 -# "ocean_model_rho2", "h", "hmo", "ocean_month_rho2", "all", "mean", "none", 2 - -# Zonal/Meridional velocity -"ocean_model_z","uo", "uo", "ocean_month_z", "all", "mean", "none",2 -"ocean_model_z","vo", "vo", "ocean_month_z", "all", "mean", "none",2 -# Potential Temperature -"ocean_model_z", "thetao", "thetao", "ocean_month_z", "all", "mean", "none",2 # if use pre-TEOS10 -# Salinity -"ocean_model_z", "so", "so", "ocean_month_z", "all", "mean", "none",2 -# Potential Density referenced to 2000 dbar -"ocean_model_z", "rhopot2", "rhopot2", "ocean_month_z", "all", "mean", "none", 2 - -# Ocean Mass X/Y Transport Vertical Sum -"ocean_model", "umo_2d", "umo_2d", "ocean_month", "all", "mean", "none",2 -"ocean_model", "vmo_2d", "vmo_2d", "ocean_month", "all", "mean", "none",2 - -# Zonal/Meridional surface stress from ocean interactions with atmos and ice -"ocean_model", "tauuo", "tauuo", "ocean_month", "all", "mean", "none",2 -"ocean_model", "tauvo", "tauvo", "ocean_month", "all", "mean", "none",2 -# Surface ocean heat flux from SW+LW+lat+sens+mass transfer+frazil+restore+seaice_melt_heat or flux adjustments -"ocean_model", "hfds", "hfds", "ocean_month", "all", "mean", "none",2 -# Net surface water flux (precip+melt+lrunoff+ice calving-evap) -"ocean_model", "wfo", "wfo", "ocean_month", "all", "mean", "none",2 -"ocean_model", "friver", "friver", "ocean_month", "all", "mean", "none",2 - # Surface area of tracer (T) cells "ocean_model", "areacello", "areacello", "ocean_static", "all", "none", "none", 2 # Depth of the ocean at tracer points @@ -81,7 +47,3 @@ "ocean_model", "areacello_bu","areacello_bu","ocean_static", "all", "none", "none", 2 -"ice_model", "siconc", "siconc", "ice_month", "all", "mean", "none", 2 -"ice_model", "siconc", "siconc", "ice_daily", "all", "mean", "none", 2 -"ice_model", "sithick", "sithick", "ice_month", "all", "mean", "none", 2 -"ice_model", "sithick", "sithick", "ice_daily", "all", "mean", "none", 2 \ No newline at end of file