Skip to content

Commit 055a6cb

Browse files
alperaltuntasalperaltuntas
authored
Diag table updates (#308) (#319)
* Add diag_table changes as described in Issue #308 * formatting * use cmor names for newly added fields. add BS_coeff_h * use CMOR names for remaining fields
1 parent 0e886e9 commit 055a6cb

2 files changed

Lines changed: 143 additions & 34 deletions

File tree

‎param_templates/diag_table.yaml‎

Lines changed: 41 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44
###############################################################################
55
---
66
FieldLists:
7-
- &prognostic ["uo", "vo", "h", "e", "thetao", "so", "KE", "MEKE", "rhopot0", "rhopot2", "difvho", "difvso", "Kv_u", "Kv_v", "taux_bot", "tauy_bot"]
7+
- &prognostic ["uo", "vo", "h", "e", "thetao", "so", "KE", "MEKE", "rhopot0", "rhopot2",
8+
"difvho", "difvso", "Kv_u", "Kv_v", "taux_bot", "tauy_bot"]
89

9-
- &prognostic_z ["uo", "vo", "h", "thetao", "so", "agessc", "rhopot0", "N2_int", "rhopot2", "difvho", "difvso", "Kv_u", "Kv_v"]
10+
- &prognostic_z ["uo", "vo", "h", "thetao", "so", "agessc", "rhopot0", "N2_int", "rhopot2",
11+
"difvho", "difvso", "Kv_u", "Kv_v"]
1012

1113
- &prognostic_rho2 ["thetao", "so", "agessc", "e"]
1214

@@ -22,32 +24,36 @@ FieldLists:
2224

2325
- &surface_flds_daily ["zos", "zossq"]
2426

25-
- &surface_flds_monthly ["sst_global", "sss_global", "SSH", "mass_wt"]
27+
- &surface_flds_monthly ["tosga", "sosga", "SSH", "mass_wt"]
2628

2729
- &kpp_diags ["KPP_OBLdepth:oml", "KPP_OBLdepth:oml_min:min", "KPP_OBLdepth:oml_max:max"]
2830

2931
- &forcing_flds ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
3032
"hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
31-
"hfsifrazil", "wfo", "vprec", "ficeberg", "fsitherm",
32-
"hflso", "pso", "seaice_melt_heat", "Heat_PmE", "salt_flux_added"]
33+
"hfsifrazil", "wfo", "ficeberg", "fsitherm",
34+
"hflso", "pso", "seaice_melt_heat", "Heat_PmE"]
3335

34-
- &enthalpy_flds [ "heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
35-
"heat_content_fprec", "heat_content_vprec", "heat_content_cond",
36+
- &enthalpy_flds ["heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
37+
"heat_content_fprec", "heat_content_cond",
3638
"heat_content_evap"]
3739

3840
- &forcing_flds_dev ["net_heat_coupler", "LwLatSens", "heat_content_lrunoff",
3941
"heat_content_frunoff", "heat_content_lprec",
40-
"heat_content_fprec", "heat_content_vprec", "heat_content_cond",
42+
"heat_content_fprec", "heat_content_cond",
4143
"hfevapds", "heat_content_surfwater",
4244
"vprec_global_adjustment", "net_fresh_water_global_adjustment",
4345
"salt_flux_global_restoring_adjustment", "net_massout", "net_massin"]
4446

47+
- &forcing_flds_b ["heat_content_frunoff_glc"]
48+
49+
- &forcing_flds_cg ["heat_content_vprec", "vprec", "salt_flux_added"]
50+
4551
- &visc_flds ["diftrelo", "diftrblo", "difmxybo", "difmxylo"]
4652

4753
- &static_flds ["geolon", "geolat", "geolon_c", "geolat_c", "geolon_u", "geolat_u",
4854
"geolon_v", "geolat_v", "deptho", "wet", "wet_c", "wet_u",
4955
"wet_v", "Coriolis", "areacello", "areacello_cu", "areacello_cv",
50-
"areacello_bu", "sin_rot", "cos_rot", "C_P", "Rho_0", "skeb_taper_v",
56+
"areacello_bu", "sin_rot", "cos_rot", "cpocean", "rhozero", "skeb_taper_v",
5157
"skeb_taper_u"]
5258

5359
- &transports ["volcello", "vmo", "vhGM", "vhml", "umo", "uhGM", "uhml"]
@@ -64,7 +70,16 @@ FieldLists:
6470

6571
- &glc_terms ["frunoff_glc", "lrunoff_glc"]
6672

67-
- &kpp_test ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdt", "KPP_NLT_temp_budget", "KPP_NLT_saln_budget"]
73+
- &kpp_test ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdt", "KPP_NLT_temp_budget",
74+
"KPP_NLT_saln_budget"]
75+
76+
- &cmip7_native ["dispkexyfo", "hfibthermds", "mlotstsq", "pbo", "S_adx_2d", "S_ady_2d", "sob",
77+
"sossq", "tob", "tossq", "zos", "zossq", "BS_coeff_h"]
78+
79+
- &cmip7_z ["opottempdiff", "T_advection_xy", "opottemptend", "osaltdiff",
80+
"S_advection_xy", "osalttend", "rsdoabsorb"]
81+
82+
- &cmip7_sfc ["tossq", "rsdo", "T_adx_2d", "T_ady_2d"]
6883

6984
###############################################################################
7085
# Section 2: File lists:
@@ -129,7 +144,9 @@ Files:
129144
*forcing_flds,
130145
*enthalpy_flds,
131146
*surface_flds_common,
132-
*surface_flds_monthly]
147+
*surface_flds_monthly,
148+
*cmip7_native,
149+
["skeb_amp"]]
133150
lists3:
134151
$USE_CFC_CAP == "True":
135152
[ *cfc_2d ]
@@ -139,6 +156,12 @@ Files:
139156
lists5:
140157
$TEST == True:
141158
[ *kpp_test ]
159+
lists6:
160+
$COMP_ATM == "cam":
161+
[ *forcing_flds_b ]
162+
else:
163+
[ *forcing_flds_cg ]
164+
142165

143166
# essential variable mapped to z_space
144167
hist_z_space:
@@ -162,7 +185,10 @@ Files:
162185
packing: = 1 if $TEST else 2
163186
lists:
164187
[ *prognostic_z,
165-
*transports ]
188+
*transports,
189+
*visc_flds,
190+
*cmip7_z,
191+
]
166192
lists2:
167193
$USE_CFC_CAP == "True":
168194
[ *cfc_3d ]
@@ -188,7 +214,9 @@ Files:
188214
packing: = 1 if $TEST else 2
189215
lists: [ *surface_flds_common,
190216
*surface_flds_daily,
191-
*kpp_diags ]
217+
*kpp_diags,
218+
*cmip7_sfc
219+
]
192220
forcing_avg:
193221
suffix:
194222
$TEST == True: "h.frc%4yr-%2mo-%2dy"

‎param_templates/json/diag_table.json‎

Lines changed: 102 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@
7979
"zossq"
8080
],
8181
[
82-
"sst_global",
83-
"sss_global",
82+
"tosga",
83+
"sosga",
8484
"SSH",
8585
"mass_wt"
8686
],
@@ -105,21 +105,18 @@
105105
"ustar",
106106
"hfsifrazil",
107107
"wfo",
108-
"vprec",
109108
"ficeberg",
110109
"fsitherm",
111110
"hflso",
112111
"pso",
113112
"seaice_melt_heat",
114-
"Heat_PmE",
115-
"salt_flux_added"
113+
"Heat_PmE"
116114
],
117115
[
118116
"heat_content_lrunoff",
119117
"heat_content_frunoff",
120118
"heat_content_lprec",
121119
"heat_content_fprec",
122-
"heat_content_vprec",
123120
"heat_content_cond",
124121
"heat_content_evap"
125122
],
@@ -130,7 +127,6 @@
130127
"heat_content_frunoff",
131128
"heat_content_lprec",
132129
"heat_content_fprec",
133-
"heat_content_vprec",
134130
"heat_content_cond",
135131
"hfevapds",
136132
"heat_content_surfwater",
@@ -140,6 +136,14 @@
140136
"net_massout",
141137
"net_massin"
142138
],
139+
[
140+
"heat_content_frunoff_glc"
141+
],
142+
[
143+
"heat_content_vprec",
144+
"vprec",
145+
"salt_flux_added"
146+
],
143147
[
144148
"diftrelo",
145149
"diftrblo",
@@ -167,8 +171,8 @@
167171
"areacello_bu",
168172
"sin_rot",
169173
"cos_rot",
170-
"C_P",
171-
"Rho_0",
174+
"cpocean",
175+
"rhozero",
172176
"skeb_taper_v",
173177
"skeb_taper_u"
174178
],
@@ -219,6 +223,36 @@
219223
"KPP_NLT_dSdt",
220224
"KPP_NLT_temp_budget",
221225
"KPP_NLT_saln_budget"
226+
],
227+
[
228+
"dispkexyfo",
229+
"hfibthermds",
230+
"mlotstsq",
231+
"pbo",
232+
"S_adx_2d",
233+
"S_ady_2d",
234+
"sob",
235+
"sossq",
236+
"tob",
237+
"tossq",
238+
"zos",
239+
"zossq",
240+
"BS_coeff_h"
241+
],
242+
[
243+
"opottempdiff",
244+
"T_advection_xy",
245+
"opottemptend",
246+
"osaltdiff",
247+
"S_advection_xy",
248+
"osalttend",
249+
"rsdoabsorb"
250+
],
251+
[
252+
"tossq",
253+
"rsdo",
254+
"T_adx_2d",
255+
"T_ady_2d"
222256
]
223257
],
224258
"Files": {
@@ -370,21 +404,18 @@
370404
"ustar",
371405
"hfsifrazil",
372406
"wfo",
373-
"vprec",
374407
"ficeberg",
375408
"fsitherm",
376409
"hflso",
377410
"pso",
378411
"seaice_melt_heat",
379-
"Heat_PmE",
380-
"salt_flux_added"
412+
"Heat_PmE"
381413
],
382414
[
383415
"heat_content_lrunoff",
384416
"heat_content_frunoff",
385417
"heat_content_lprec",
386418
"heat_content_fprec",
387-
"heat_content_vprec",
388419
"heat_content_cond",
389420
"heat_content_evap"
390421
],
@@ -406,10 +437,28 @@
406437
"mlotst:mlotst_max:max"
407438
],
408439
[
409-
"sst_global",
410-
"sss_global",
440+
"tosga",
441+
"sosga",
411442
"SSH",
412443
"mass_wt"
444+
],
445+
[
446+
"dispkexyfo",
447+
"hfibthermds",
448+
"mlotstsq",
449+
"pbo",
450+
"S_adx_2d",
451+
"S_ady_2d",
452+
"sob",
453+
"sossq",
454+
"tob",
455+
"tossq",
456+
"zos",
457+
"zossq",
458+
"BS_coeff_h"
459+
],
460+
[
461+
"skeb_amp"
413462
]
414463
]
415464
},
@@ -442,6 +491,20 @@
442491
"KPP_NLT_saln_budget"
443492
]
444493
]
494+
},
495+
"lists6": {
496+
"$COMP_ATM == \"cam\"": [
497+
[
498+
"heat_content_frunoff_glc"
499+
]
500+
],
501+
"else": [
502+
[
503+
"heat_content_vprec",
504+
"vprec",
505+
"salt_flux_added"
506+
]
507+
]
445508
}
446509
}
447510
}
@@ -492,6 +555,21 @@
492555
"umo",
493556
"uhGM",
494557
"uhml"
558+
],
559+
[
560+
"diftrelo",
561+
"diftrblo",
562+
"difmxybo",
563+
"difmxylo"
564+
],
565+
[
566+
"opottempdiff",
567+
"T_advection_xy",
568+
"opottemptend",
569+
"osaltdiff",
570+
"S_advection_xy",
571+
"osalttend",
572+
"rsdoabsorb"
495573
]
496574
],
497575
"lists2": {
@@ -553,6 +631,12 @@
553631
"KPP_OBLdepth:oml",
554632
"KPP_OBLdepth:oml_min:min",
555633
"KPP_OBLdepth:oml_max:max"
634+
],
635+
[
636+
"tossq",
637+
"rsdo",
638+
"T_adx_2d",
639+
"T_ady_2d"
556640
]
557641
]
558642
}
@@ -597,14 +681,12 @@
597681
"ustar",
598682
"hfsifrazil",
599683
"wfo",
600-
"vprec",
601684
"ficeberg",
602685
"fsitherm",
603686
"hflso",
604687
"pso",
605688
"seaice_melt_heat",
606-
"Heat_PmE",
607-
"salt_flux_added"
689+
"Heat_PmE"
608690
],
609691
[
610692
"net_heat_coupler",
@@ -613,7 +695,6 @@
613695
"heat_content_frunoff",
614696
"heat_content_lprec",
615697
"heat_content_fprec",
616-
"heat_content_vprec",
617698
"heat_content_cond",
618699
"hfevapds",
619700
"heat_content_surfwater",
@@ -692,8 +773,8 @@
692773
"areacello_bu",
693774
"sin_rot",
694775
"cos_rot",
695-
"C_P",
696-
"Rho_0",
776+
"cpocean",
777+
"rhozero",
697778
"skeb_taper_v",
698779
"skeb_taper_u"
699780
]

0 commit comments

Comments
 (0)