Skip to content

Commit 4db71c6

Browse files
alperaltuntasalperaltuntas
committed
Add diag_table changes as described in Issue #308 
1 parent aa948d4 commit 4db71c6

2 files changed

Lines changed: 125 additions & 22 deletions

File tree

‎param_templates/diag_table.yaml‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,24 @@ FieldLists:
2828

2929
- &forcing_flds ["tauuo", "tauvo", "friver", "prsn", "prlq", "evs", "hfsso", "rlntds",
3030
"hfsnthermds", "sfdsi", "rsntds", "hfds", "ustar",
31-
"hfsifrazil", "wfo", "vprec", "ficeberg", "fsitherm",
32-
"hflso", "pso", "seaice_melt_heat", "Heat_PmE", "salt_flux_added"]
33-
34-
- &enthalpy_flds [ "heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
35-
"heat_content_fprec", "heat_content_vprec", "heat_content_cond",
31+
"hfsifrazil", "wfo", "ficeberg", "fsitherm",
32+
"hflso", "pso", "seaice_melt_heat", "Heat_PmE"]
33+
34+
- &enthalpy_flds ["heat_content_lrunoff", "heat_content_frunoff", "heat_content_lprec",
35+
"heat_content_fprec", "heat_content_cond",
3636
"heat_content_evap"]
3737

3838
- &forcing_flds_dev ["net_heat_coupler", "LwLatSens", "heat_content_lrunoff",
3939
"heat_content_frunoff", "heat_content_lprec",
40-
"heat_content_fprec", "heat_content_vprec", "heat_content_cond",
40+
"heat_content_fprec", "heat_content_cond",
4141
"hfevapds", "heat_content_surfwater",
4242
"vprec_global_adjustment", "net_fresh_water_global_adjustment",
4343
"salt_flux_global_restoring_adjustment", "net_massout", "net_massin"]
4444

45+
- &forcing_flds_b ["heat_content_frunoff_glc"]
46+
47+
- &forcing_flds_cg ["heat_content_vprec", "vprec", "salt_flux_added"]
48+
4549
- &visc_flds ["diftrelo", "diftrblo", "difmxybo", "difmxylo"]
4650

4751
- &static_flds ["geolon", "geolat", "geolon_c", "geolat_c", "geolon_u", "geolat_u",
@@ -66,6 +70,12 @@ FieldLists:
6670

6771
- &kpp_test ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdt", "KPP_NLT_temp_budget", "KPP_NLT_saln_budget"]
6872

73+
- &cmip7_native ["FrictWorkIntz", "hfibthermds", "mlotstsq", "pbo", "S_adx_2d", "S_ady_2d", "sob", "sossq", "tob", "tossq", "zos", "zossq"]
74+
75+
- &cmip7_z ["Khh", "Ahh", "KHTH_t", "KHTR_h", "diabatic_heat_tendency", "T_advection_xy", "Th_tendency", "diabatic_salt_tendency", "S_advection_xy", "Sh_tendency", "rsdoabsorb"]
76+
77+
- &cmip7_sfc ["tossq", "rsdo", "T_adx_2d", "T_ady_2d"]
78+
6979
###############################################################################
7080
# Section 2: File lists:
7181
# List of files to be added in diag_table
@@ -129,7 +139,9 @@ Files:
129139
*forcing_flds,
130140
*enthalpy_flds,
131141
*surface_flds_common,
132-
*surface_flds_monthly]
142+
*surface_flds_monthly,
143+
*cmip7_native,
144+
["skeb_amp"]]
133145
lists3:
134146
$USE_CFC_CAP == "True":
135147
[ *cfc_2d ]
@@ -139,6 +151,12 @@ Files:
139151
lists5:
140152
$TEST == True:
141153
[ *kpp_test ]
154+
lists6:
155+
$COMP_ATM == "cam":
156+
[ *forcing_flds_b ]
157+
else:
158+
[ *forcing_flds_cg ]
159+
142160

143161
# essential variable mapped to z_space
144162
hist_z_space:
@@ -162,7 +180,9 @@ Files:
162180
packing: = 1 if $TEST else 2
163181
lists:
164182
[ *prognostic_z,
165-
*transports ]
183+
*transports,
184+
*cmip7_z,
185+
]
166186
lists2:
167187
$USE_CFC_CAP == "True":
168188
[ *cfc_3d ]
@@ -188,7 +208,9 @@ Files:
188208
packing: = 1 if $TEST else 2
189209
lists: [ *surface_flds_common,
190210
*surface_flds_daily,
191-
*kpp_diags ]
211+
*kpp_diags,
212+
*cmip7_sfc
213+
]
192214
forcing_avg:
193215
suffix:
194216
$TEST == True: "h.frc%4yr-%2mo-%2dy"

‎param_templates/json/diag_table.json‎

Lines changed: 94 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -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",
@@ -219,6 +223,39 @@
219223
"KPP_NLT_dSdt",
220224
"KPP_NLT_temp_budget",
221225
"KPP_NLT_saln_budget"
226+
],
227+
[
228+
"FrictWorkIntz",
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+
],
241+
[
242+
"Khh",
243+
"Ahh",
244+
"KHTH_t",
245+
"KHTR_h",
246+
"diabatic_heat_tendency",
247+
"T_advection_xy",
248+
"Th_tendency",
249+
"diabatic_salt_tendency",
250+
"S_advection_xy",
251+
"Sh_tendency",
252+
"rsdoabsorb"
253+
],
254+
[
255+
"tossq",
256+
"rsdo",
257+
"T_adx_2d",
258+
"T_ady_2d"
222259
]
223260
],
224261
"Files": {
@@ -370,21 +407,18 @@
370407
"ustar",
371408
"hfsifrazil",
372409
"wfo",
373-
"vprec",
374410
"ficeberg",
375411
"fsitherm",
376412
"hflso",
377413
"pso",
378414
"seaice_melt_heat",
379-
"Heat_PmE",
380-
"salt_flux_added"
415+
"Heat_PmE"
381416
],
382417
[
383418
"heat_content_lrunoff",
384419
"heat_content_frunoff",
385420
"heat_content_lprec",
386421
"heat_content_fprec",
387-
"heat_content_vprec",
388422
"heat_content_cond",
389423
"heat_content_evap"
390424
],
@@ -410,6 +444,23 @@
410444
"sss_global",
411445
"SSH",
412446
"mass_wt"
447+
],
448+
[
449+
"FrictWorkIntz",
450+
"hfibthermds",
451+
"mlotstsq",
452+
"pbo",
453+
"S_adx_2d",
454+
"S_ady_2d",
455+
"sob",
456+
"sossq",
457+
"tob",
458+
"tossq",
459+
"zos",
460+
"zossq"
461+
],
462+
[
463+
"skeb_amp"
413464
]
414465
]
415466
},
@@ -442,6 +493,20 @@
442493
"KPP_NLT_saln_budget"
443494
]
444495
]
496+
},
497+
"lists6": {
498+
"$COMP_ATM == \"cam\"": [
499+
[
500+
"heat_content_frunoff_glc"
501+
]
502+
],
503+
"else": [
504+
[
505+
"heat_content_vprec",
506+
"vprec",
507+
"salt_flux_added"
508+
]
509+
]
445510
}
446511
}
447512
}
@@ -492,6 +557,19 @@
492557
"umo",
493558
"uhGM",
494559
"uhml"
560+
],
561+
[
562+
"Khh",
563+
"Ahh",
564+
"KHTH_t",
565+
"KHTR_h",
566+
"diabatic_heat_tendency",
567+
"T_advection_xy",
568+
"Th_tendency",
569+
"diabatic_salt_tendency",
570+
"S_advection_xy",
571+
"Sh_tendency",
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",

0 commit comments

Comments
 (0)