diff --git a/.gitmodules b/.gitmodules index 3643769..6835f67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,7 +2,7 @@ path = MOM6 url = https://github.com/NCAR/MOM6.git fxDONOTUSEurl = https://github.com/NCAR/MOM6.git - fxtag = dev/ncar_260311 + fxtag = dev/ncar_260504 fxrequired = AlwaysRequired [submodule "stochastic_physics"] diff --git a/MOM6 b/MOM6 index b15bc97..3c72c35 160000 --- a/MOM6 +++ b/MOM6 @@ -1 +1 @@ -Subproject commit b15bc9780bc630236b048fcfd27b5ad177f55abe +Subproject commit 3c72c3502b0628e4ac52b1e4c393c477d4864e84 diff --git a/param_templates/diag_table.yaml b/param_templates/diag_table.yaml index 7b3cc49..a8b258e 100644 --- a/param_templates/diag_table.yaml +++ b/param_templates/diag_table.yaml @@ -91,15 +91,18 @@ Files: sigma2_hist: suffix: $TEST == True: "h.rho2%4yr-%2mo-%2dy" + $OCN_DIAG_MODE == "spinup": "h.rho2%4yr" else: "h.rho2%4yr-%2mo" output_freq: 1 output_freq_units: $TEST == True : "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" time_axis_units: "days" new_file_freq: 1 new_file_freq_units: $TEST == True: "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" reduction_method: "mean" # time average regional_section: "none" # global @@ -116,15 +119,18 @@ Files: hist: suffix: $TEST == True: "h.native%4yr-%2mo-%2dy" + $OCN_DIAG_MODE == "spinup": "h.native%4yr" else: "h.native%4yr-%2mo" output_freq: 1 output_freq_units: $TEST == True : "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" time_axis_units: "days" new_file_freq: 1 new_file_freq_units: $TEST == True: "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" reduction_method: "mean" # time average regional_section: "none" # global @@ -147,6 +153,13 @@ Files: *surface_flds_monthly, *cmip7_native, ["skeb_amp"]] + $OCN_DIAG_MODE == "spinup": + [ *prognostic, + *kpp_diags, + *forcing_flds, + *enthalpy_flds, + *surface_flds_common, + *surface_flds_monthly] lists3: $USE_CFC_CAP == "True": [ *cfc_2d ] @@ -167,15 +180,18 @@ Files: hist_z_space: suffix: $TEST == True: "h.z%4yr-%2mo-%2dy" + $OCN_DIAG_MODE == "spinup": "h.z%4yr" else: "h.z%4yr-%2mo" output_freq: 1 output_freq_units: $TEST == True : "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" time_axis_units: "days" new_file_freq: 1 new_file_freq_units: $TEST == True: "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" reduction_method: "mean" # time average regional_section: "none" # global @@ -184,11 +200,15 @@ Files: module: "ocean_model_z" # z_space packing: = 1 if $TEST else 2 lists: - [ *prognostic_z, - *transports, - *visc_flds, - *cmip7_z, - ] + $OCN_DIAG_MODE == "spinup": + [ *prognostic_z, + *transports ] + else: + [ *prognostic_z, + *transports, + *visc_flds, + *cmip7_z, + ] lists2: $USE_CFC_CAP == "True": [ *cfc_3d ] @@ -196,6 +216,7 @@ Files: surface_avg: suffix: $TEST == True: "h.sfc%4yr-%2mo-%2dy" + $OCN_DIAG_MODE == "spinup": "h.sfc%4yr" else: "h.sfc%4yr-%2mo" output_freq: $OCN_DIAG_MODE == "spinup": 5 @@ -205,6 +226,7 @@ Files: new_file_freq: 1 new_file_freq_units: $TEST == True: "days" + $OCN_DIAG_MODE == "spinup": "years" else: "months" reduction_method: "mean" # time average regional_section: "none" # global @@ -212,11 +234,16 @@ Files: $OCN_DIAG_MODE != "none": module: "ocean_model" # native packing: = 1 if $TEST else 2 - lists: [ *surface_flds_common, - *surface_flds_daily, - *kpp_diags, - *cmip7_sfc - ] + lists: + $OCN_DIAG_MODE == "spinup": + [ *surface_flds_common, + *surface_flds_daily, + *kpp_diags ] + else: + [ *surface_flds_common, + *surface_flds_daily, + *kpp_diags, + *cmip7_sfc ] forcing_avg: suffix: $TEST == True: "h.frc%4yr-%2mo-%2dy" @@ -279,12 +306,18 @@ Files: # Sections ------------------------------------ Agulhas: - suffix: "h.Agulhas_Section%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Agulhas_Section%4yr" + else: "h.Agulhas_Section%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "20.1 20.1 -69.8 -34.6 -1 -1" @@ -295,12 +328,18 @@ Files: lists: [ *vert_sections_u ] Barents_Opening: - suffix: "h.Barents_Opening%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Barents_Opening%4yr" + else: "h.Barents_Opening%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-5.75 19.0 78.93 78.93 -1 -1" @@ -311,12 +350,18 @@ Files: lists: [ *vert_sections_v ] Bering_Strait: - suffix: "h.Bering_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Bering_Strait%4yr" + else: "h.Bering_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-174.5 -172.3 66.6 66.6 -1 -1" @@ -327,12 +372,18 @@ Files: lists: [ *vert_sections_v ] Bosphorus_Strait: - suffix: "h.Bosphorus_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Bosphorus_Strait%4yr" + else: "h.Bosphorus_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "28.3 29.0 42.9 42.9 -1 -1" @@ -343,12 +394,18 @@ Files: lists: [ *vert_sections_v ] Davis_Strait: - suffix: "h.Davis_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Davis_Strait%4yr" + else: "h.Davis_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-53.1 -46.2 69.5 69.5 -1 -1" @@ -359,12 +416,18 @@ Files: lists: [ *vert_sections_v ] Denmark_Strait: - suffix: "h.Denmark_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Denmark_Strait%4yr" + else: "h.Denmark_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-38.0 -22.5 65.0 65.0 -1 -1" @@ -375,12 +438,18 @@ Files: lists: [ *vert_sections_v ] Drake_Passage: - suffix: "h.Drake_Passage%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Drake_Passage%4yr" + else: "h.Drake_Passage%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-67.0 -67.0 -67.2 -55.1 -1 -1" @@ -391,12 +460,18 @@ Files: lists: [ *vert_sections_u ] English_Channel: - suffix: "h.English_Channel%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.English_Channel%4yr" + else: "h.English_Channel%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-0.333 -0.333 51.1 51.7 -1 -1" @@ -407,12 +482,18 @@ Files: lists: [ *vert_sections_u ] Fram_Strait: - suffix: "h.Fram_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Fram_Strait%4yr" + else: "h.Fram_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-21.0 -10.4 80.5 80.5 -1 -1" @@ -423,12 +504,18 @@ Files: lists: [ *vert_sections_v ] Florida_Bahamas: - suffix: "h.Florida_Bahamas%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Florida_Bahamas%4yr" + else: "h.Florida_Bahamas%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-80.26 -78.24 25.5 25.5 -1 -1" @@ -439,12 +526,18 @@ Files: lists: [ *vert_sections_v ] Florida_Bahamas_extended: - suffix: "h.Florida_Bahamas_extended%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Florida_Bahamas_extended%4yr" + else: "h.Florida_Bahamas_extended%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-78.0 -72.0 24.5 24.5 -1 -1" @@ -455,12 +548,18 @@ Files: lists: [ *vert_sections_v ] Florida_Cuba: - suffix: "h.Florida_Cuba%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Florida_Cuba%4yr" + else: "h.Florida_Cuba%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-80.75 -80.75 23.0 25.5 -1 -1" @@ -471,12 +570,18 @@ Files: lists: [ *vert_sections_u ] Gibraltar_Strait: - suffix: "h.Gibraltar_Strait%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Gibraltar_Strait%4yr" + else: "h.Gibraltar_Strait%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-6.3 -6.3 35.7 36.4 -1 -1" @@ -487,12 +592,18 @@ Files: lists: [ *vert_sections_u ] Iceland_Norway: - suffix: "h.Iceland_Norway%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Iceland_Norway%4yr" + else: "h.Iceland_Norway%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-17.0 1.5 65.0 65.0 -1 -1" @@ -503,12 +614,18 @@ Files: lists: [ *vert_sections_v ] Indonesian_Throughflow: - suffix: "h.Indonesian_Throughflow%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Indonesian_Throughflow%4yr" + else: "h.Indonesian_Throughflow%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-246.5 -220.8 -7.0 -7.0 -1 -1" @@ -519,12 +636,18 @@ Files: lists: [ *vert_sections_v ] Mozambique_Channel: - suffix: "h.Mozambique_Channel%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Mozambique_Channel%4yr" + else: "h.Mozambique_Channel%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "39.9 44.7 -16.25 -16.25 -1 -1" @@ -535,12 +658,18 @@ Files: lists: [ *vert_sections_v ] Pacific_undercurrent: - suffix: "h.Pacific_undercurrent%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Pacific_undercurrent%4yr" + else: "h.Pacific_undercurrent%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-155.0 -155.0 -2.0 2.0 -1 -1" @@ -551,12 +680,18 @@ Files: lists: [ *vert_sections_u ] Robeson_Channel: - suffix: "h.Robeson_Channel%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Robeson_Channel%4yr" + else: "h.Robeson_Channel%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-34.8 -34.8 83.07 83.70 -1 -1" @@ -567,12 +702,18 @@ Files: lists: [ *vert_sections_u ] Taiwan_Luzon: - suffix: "h.Taiwan_Luzon%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Taiwan_Luzon%4yr" + else: "h.Taiwan_Luzon%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-239.0 -239.0 18.5 22.45 -1 -1" @@ -583,12 +724,18 @@ Files: lists: [ *vert_sections_u ] Windward_Passage: - suffix: "h.Windward_Passage%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Windward_Passage%4yr" + else: "h.Windward_Passage%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-74.35 -73.0 19.92 19.92 -1 -1" @@ -599,12 +746,18 @@ Files: lists: [ *vert_sections_v ] Yucatan_Channel: - suffix: "h.Yucatan_Channel%4yr-%2mo" + suffix: + $OCN_DIAG_MODE == "spinup": "h.Yucatan_Channel%4yr" + else: "h.Yucatan_Channel%4yr-%2mo" output_freq: 1 - output_freq_units: "months" + output_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" time_axis_units: "days" new_file_freq: 1 - new_file_freq_units: "months" + new_file_freq_units: + $OCN_DIAG_MODE == "spinup": "years" + else: "months" reduction_method: ".true." # time average regional_section: $OCN_GRID == "tx2_3v2": "-87.0 -85.0 21.785 21.785 -1 -1" diff --git a/param_templates/json/diag_table.json b/param_templates/json/diag_table.json index 058d88c..e20caa0 100644 --- a/param_templates/json/diag_table.json +++ b/param_templates/json/diag_table.json @@ -259,17 +259,20 @@ "sigma2_hist": { "suffix": { "$TEST == True": "h.rho2%4yr-%2mo-%2dy", + "$OCN_DIAG_MODE == \"spinup\"": "h.rho2%4yr", "else": "h.rho2%4yr-%2mo" }, "output_freq": 1, "output_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "time_axis_units": "days", "new_file_freq": 1, "new_file_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "reduction_method": "mean", @@ -309,17 +312,20 @@ "hist": { "suffix": { "$TEST == True": "h.native%4yr-%2mo-%2dy", + "$OCN_DIAG_MODE == \"spinup\"": "h.native%4yr", "else": "h.native%4yr-%2mo" }, "output_freq": 1, "output_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "time_axis_units": "days", "new_file_freq": 1, "new_file_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "reduction_method": "mean", @@ -460,6 +466,85 @@ [ "skeb_amp" ] + ], + "$OCN_DIAG_MODE == \"spinup\"": [ + [ + "uo", + "vo", + "h", + "e", + "thetao", + "so", + "KE", + "MEKE", + "rhopot0", + "rhopot2", + "difvho", + "difvso", + "Kv_u", + "Kv_v", + "taux_bot", + "tauy_bot" + ], + [ + "KPP_OBLdepth:oml", + "KPP_OBLdepth:oml_min:min", + "KPP_OBLdepth:oml_max:max" + ], + [ + "tauuo", + "tauvo", + "friver", + "prsn", + "prlq", + "evs", + "hfsso", + "rlntds", + "hfsnthermds", + "sfdsi", + "rsntds", + "hfds", + "ustar", + "hfsifrazil", + "wfo", + "ficeberg", + "fsitherm", + "hflso", + "pso", + "seaice_melt_heat", + "Heat_PmE" + ], + [ + "heat_content_lrunoff", + "heat_content_frunoff", + "heat_content_lprec", + "heat_content_fprec", + "heat_content_cond", + "heat_content_evap" + ], + [ + "tos", + "tos:tos_min:min", + "tos:tos_max:max", + "sos", + "sos:sos_min:min", + "sos:sos_max:max", + "SSU", + "SSV", + "opottempmint", + "somint", + "Rd_dx", + "speed", + "mlotst", + "mlotst:mlotst_min:min", + "mlotst:mlotst_max:max" + ], + [ + "tosga", + "sosga", + "SSH", + "mass_wt" + ] ] }, "lists3": { @@ -512,17 +597,20 @@ "hist_z_space": { "suffix": { "$TEST == True": "h.z%4yr-%2mo-%2dy", + "$OCN_DIAG_MODE == \"spinup\"": "h.z%4yr", "else": "h.z%4yr-%2mo" }, "output_freq": 1, "output_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "time_axis_units": "days", "new_file_freq": 1, "new_file_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "reduction_method": "mean", @@ -531,47 +619,75 @@ "$OCN_DIAG_MODE != \"none\"": { "module": "ocean_model_z", "packing": "= 1 if $TEST else 2", - "lists": [ - [ - "uo", - "vo", - "h", - "thetao", - "so", - "agessc", - "rhopot0", - "N2_int", - "rhopot2", - "difvho", - "difvso", - "Kv_u", - "Kv_v" - ], - [ - "volcello", - "vmo", - "vhGM", - "vhml", - "umo", - "uhGM", - "uhml" - ], - [ - "diftrelo", - "diftrblo", - "difmxybo", - "difmxylo" + "lists": { + "$OCN_DIAG_MODE == \"spinup\"": [ + [ + "uo", + "vo", + "h", + "thetao", + "so", + "agessc", + "rhopot0", + "N2_int", + "rhopot2", + "difvho", + "difvso", + "Kv_u", + "Kv_v" + ], + [ + "volcello", + "vmo", + "vhGM", + "vhml", + "umo", + "uhGM", + "uhml" + ] ], - [ - "opottempdiff", - "T_advection_xy", - "opottemptend", - "osaltdiff", - "S_advection_xy", - "osalttend", - "rsdoabsorb" + "else": [ + [ + "uo", + "vo", + "h", + "thetao", + "so", + "agessc", + "rhopot0", + "N2_int", + "rhopot2", + "difvho", + "difvso", + "Kv_u", + "Kv_v" + ], + [ + "volcello", + "vmo", + "vhGM", + "vhml", + "umo", + "uhGM", + "uhml" + ], + [ + "diftrelo", + "diftrblo", + "difmxybo", + "difmxylo" + ], + [ + "opottempdiff", + "T_advection_xy", + "opottemptend", + "osaltdiff", + "S_advection_xy", + "osalttend", + "rsdoabsorb" + ] ] - ], + }, "lists2": { "$USE_CFC_CAP == \"True\"": [ [ @@ -586,6 +702,7 @@ "surface_avg": { "suffix": { "$TEST == True": "h.sfc%4yr-%2mo-%2dy", + "$OCN_DIAG_MODE == \"spinup\"": "h.sfc%4yr", "else": "h.sfc%4yr-%2mo" }, "output_freq": { @@ -597,6 +714,7 @@ "new_file_freq": 1, "new_file_freq_units": { "$TEST == True": "days", + "$OCN_DIAG_MODE == \"spinup\"": "years", "else": "months" }, "reduction_method": "mean", @@ -605,40 +723,70 @@ "$OCN_DIAG_MODE != \"none\"": { "module": "ocean_model", "packing": "= 1 if $TEST else 2", - "lists": [ - [ - "tos", - "tos:tos_min:min", - "tos:tos_max:max", - "sos", - "sos:sos_min:min", - "sos:sos_max:max", - "SSU", - "SSV", - "opottempmint", - "somint", - "Rd_dx", - "speed", - "mlotst", - "mlotst:mlotst_min:min", - "mlotst:mlotst_max:max" - ], - [ - "zos", - "zossq" - ], - [ - "KPP_OBLdepth:oml", - "KPP_OBLdepth:oml_min:min", - "KPP_OBLdepth:oml_max:max" + "lists": { + "$OCN_DIAG_MODE == \"spinup\"": [ + [ + "tos", + "tos:tos_min:min", + "tos:tos_max:max", + "sos", + "sos:sos_min:min", + "sos:sos_max:max", + "SSU", + "SSV", + "opottempmint", + "somint", + "Rd_dx", + "speed", + "mlotst", + "mlotst:mlotst_min:min", + "mlotst:mlotst_max:max" + ], + [ + "zos", + "zossq" + ], + [ + "KPP_OBLdepth:oml", + "KPP_OBLdepth:oml_min:min", + "KPP_OBLdepth:oml_max:max" + ] ], - [ - "tossq", - "rsdo", - "T_adx_2d", - "T_ady_2d" + "else": [ + [ + "tos", + "tos:tos_min:min", + "tos:tos_max:max", + "sos", + "sos:sos_min:min", + "sos:sos_max:max", + "SSU", + "SSV", + "opottempmint", + "somint", + "Rd_dx", + "speed", + "mlotst", + "mlotst:mlotst_min:min", + "mlotst:mlotst_max:max" + ], + [ + "zos", + "zossq" + ], + [ + "KPP_OBLdepth:oml", + "KPP_OBLdepth:oml_min:min", + "KPP_OBLdepth:oml_max:max" + ], + [ + "tossq", + "rsdo", + "T_adx_2d", + "T_ady_2d" + ] ] - ] + } } } }, @@ -789,12 +937,21 @@ } }, "Agulhas": { - "suffix": "h.Agulhas_Section%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Agulhas_Section%4yr", + "else": "h.Agulhas_Section%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "20.1 20.1 -69.8 -34.6 -1 -1" @@ -816,12 +973,21 @@ } }, "Barents_Opening": { - "suffix": "h.Barents_Opening%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Barents_Opening%4yr", + "else": "h.Barents_Opening%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-5.75 19.0 78.93 78.93 -1 -1" @@ -843,12 +1009,21 @@ } }, "Bering_Strait": { - "suffix": "h.Bering_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Bering_Strait%4yr", + "else": "h.Bering_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-174.5 -172.3 66.6 66.6 -1 -1" @@ -870,12 +1045,21 @@ } }, "Bosphorus_Strait": { - "suffix": "h.Bosphorus_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Bosphorus_Strait%4yr", + "else": "h.Bosphorus_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "28.3 29.0 42.9 42.9 -1 -1" @@ -897,12 +1081,21 @@ } }, "Davis_Strait": { - "suffix": "h.Davis_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Davis_Strait%4yr", + "else": "h.Davis_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-53.1 -46.2 69.5 69.5 -1 -1" @@ -924,12 +1117,21 @@ } }, "Denmark_Strait": { - "suffix": "h.Denmark_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Denmark_Strait%4yr", + "else": "h.Denmark_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-38.0 -22.5 65.0 65.0 -1 -1" @@ -951,12 +1153,21 @@ } }, "Drake_Passage": { - "suffix": "h.Drake_Passage%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Drake_Passage%4yr", + "else": "h.Drake_Passage%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-67.0 -67.0 -67.2 -55.1 -1 -1" @@ -978,12 +1189,21 @@ } }, "English_Channel": { - "suffix": "h.English_Channel%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.English_Channel%4yr", + "else": "h.English_Channel%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-0.333 -0.333 51.1 51.7 -1 -1" @@ -1005,12 +1225,21 @@ } }, "Fram_Strait": { - "suffix": "h.Fram_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Fram_Strait%4yr", + "else": "h.Fram_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-21.0 -10.4 80.5 80.5 -1 -1" @@ -1032,12 +1261,21 @@ } }, "Florida_Bahamas": { - "suffix": "h.Florida_Bahamas%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Florida_Bahamas%4yr", + "else": "h.Florida_Bahamas%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-80.26 -78.24 25.5 25.5 -1 -1" @@ -1059,12 +1297,21 @@ } }, "Florida_Bahamas_extended": { - "suffix": "h.Florida_Bahamas_extended%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Florida_Bahamas_extended%4yr", + "else": "h.Florida_Bahamas_extended%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-78.0 -72.0 24.5 24.5 -1 -1" @@ -1086,12 +1333,21 @@ } }, "Florida_Cuba": { - "suffix": "h.Florida_Cuba%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Florida_Cuba%4yr", + "else": "h.Florida_Cuba%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-80.75 -80.75 23.0 25.5 -1 -1" @@ -1113,12 +1369,21 @@ } }, "Gibraltar_Strait": { - "suffix": "h.Gibraltar_Strait%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Gibraltar_Strait%4yr", + "else": "h.Gibraltar_Strait%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-6.3 -6.3 35.7 36.4 -1 -1" @@ -1140,12 +1405,21 @@ } }, "Iceland_Norway": { - "suffix": "h.Iceland_Norway%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Iceland_Norway%4yr", + "else": "h.Iceland_Norway%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-17.0 1.5 65.0 65.0 -1 -1" @@ -1167,12 +1441,21 @@ } }, "Indonesian_Throughflow": { - "suffix": "h.Indonesian_Throughflow%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Indonesian_Throughflow%4yr", + "else": "h.Indonesian_Throughflow%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-246.5 -220.8 -7.0 -7.0 -1 -1" @@ -1194,12 +1477,21 @@ } }, "Mozambique_Channel": { - "suffix": "h.Mozambique_Channel%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Mozambique_Channel%4yr", + "else": "h.Mozambique_Channel%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "39.9 44.7 -16.25 -16.25 -1 -1" @@ -1221,12 +1513,21 @@ } }, "Pacific_undercurrent": { - "suffix": "h.Pacific_undercurrent%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Pacific_undercurrent%4yr", + "else": "h.Pacific_undercurrent%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-155.0 -155.0 -2.0 2.0 -1 -1" @@ -1248,12 +1549,21 @@ } }, "Robeson_Channel": { - "suffix": "h.Robeson_Channel%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Robeson_Channel%4yr", + "else": "h.Robeson_Channel%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-34.8 -34.8 83.07 83.70 -1 -1" @@ -1275,12 +1585,21 @@ } }, "Taiwan_Luzon": { - "suffix": "h.Taiwan_Luzon%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Taiwan_Luzon%4yr", + "else": "h.Taiwan_Luzon%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-239.0 -239.0 18.5 22.45 -1 -1" @@ -1302,12 +1621,21 @@ } }, "Windward_Passage": { - "suffix": "h.Windward_Passage%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Windward_Passage%4yr", + "else": "h.Windward_Passage%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-74.35 -73.0 19.92 19.92 -1 -1" @@ -1329,12 +1657,21 @@ } }, "Yucatan_Channel": { - "suffix": "h.Yucatan_Channel%4yr-%2mo", + "suffix": { + "$OCN_DIAG_MODE == \"spinup\"": "h.Yucatan_Channel%4yr", + "else": "h.Yucatan_Channel%4yr-%2mo" + }, "output_freq": 1, - "output_freq_units": "months", + "output_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "time_axis_units": "days", "new_file_freq": 1, - "new_file_freq_units": "months", + "new_file_freq_units": { + "$OCN_DIAG_MODE == \"spinup\"": "years", + "else": "months" + }, "reduction_method": ".true.", "regional_section": { "$OCN_GRID == \"tx2_3v2\"": "-87.0 -85.0 21.785 21.785 -1 -1"