Skip to content

Commit c1583bc

Browse files
alperaltuntasalperaltuntas
authored
Additional fields in diag_table and turn off RESTART_CHECKSUMS_REQUIRED for non-test runs (#241)
* additional fields in diag_table * correct KPP_NLT_dSdt and enable sfc for test runs * set RESTART_CHECKSUMS_REQUIRED to False for non-test runs
1 parent 1bbe91b commit c1583bc

4 files changed

Lines changed: 95 additions & 14 deletions

File tree

‎param_templates/MOM_input.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3678,7 +3678,15 @@ Global:
36783678
Fraction of GM work that is added to backscatter rate."
36793679
datatype: real
36803680
value: 0.75
3681-
3681+
RESTART_CHECKSUMS_REQUIRED:
3682+
description: |
3683+
"[Boolean] default = True
3684+
If true, require the restart checksums to match and error out otherwise. Users
3685+
may want to avoid this comparison if for example the restarts are made from a
3686+
run with a different mask_table than the current run, in which case the
3687+
checksums will not match and cause crash.
3688+
datatype: logical
3689+
value: $TEST
36823690
KPP:
36833691
N_SMOOTH:
36843692
description: |

‎param_templates/diag_table.yaml‎

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

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

11-
- &prognostic_rho2 ["thetao", "so", "agessc"]
11+
- &prognostic_rho2 ["thetao", "so", "agessc", "e"]
1212

1313
- &hist_additional ["soga", "thetaoga", "uh", "vh", "vhbt", "uhbt", "rsdo"]
1414

@@ -61,6 +61,10 @@ FieldLists:
6161

6262
- &geothermal ["Geo_heat"]
6363

64+
- &glc_terms ["frunoff_glc", "lrunoff_glc"]
65+
66+
- &kpp_test ["KPP_QminusSW", "KPP_netSalt", "KPP_NLT_dTdt", "KPP_NLT_dSdt", "KPP_NLT_temp_budget", "KPP_NLT_saln_budget"]
67+
6468
###############################################################################
6569
# Section 2: File lists:
6670
# List of files to be added in diag_table
@@ -128,6 +132,12 @@ Files:
128132
lists3:
129133
$USE_CFC_CAP == "True":
130134
[ *cfc_2d ]
135+
lists4:
136+
$COMP_ATM == "cam":
137+
[ *glc_terms ]
138+
lists5:
139+
$TEST == True:
140+
[ *kpp_test ]
131141

132142
# essential variable mapped to z_space
133143
hist_z_space:
@@ -158,7 +168,7 @@ Files:
158168

159169
surface_avg:
160170
suffix:
161-
$TEST == True: "h.sfc%4yr-%2mo-2dy"
171+
$TEST == True: "h.sfc%4yr-%2mo-%2dy"
162172
else: "h.sfc%4yr-%2mo"
163173
output_freq:
164174
$OCN_DIAG_MODE == "spinup": 5
@@ -172,7 +182,7 @@ Files:
172182
reduction_method: "mean" # time average
173183
regional_section: "none" # global
174184
fields:
175-
$OCN_DIAG_MODE != "none" and $TEST is not True :
185+
$OCN_DIAG_MODE != "none":
176186
module: "ocean_model" # native
177187
packing: = 1 if $TEST else 2
178188
lists: [ *surface_flds_common,

‎param_templates/json/MOM_input.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2981,6 +2981,11 @@
29812981
"description": "\"[nondim] default = 0.0\nFraction of GM work that is added to backscatter rate.\"\n",
29822982
"datatype": "real",
29832983
"value": 0.75
2984+
},
2985+
"RESTART_CHECKSUMS_REQUIRED": {
2986+
"description": "\"[Boolean] default = True\nIf true, require the restart checksums to match and error out otherwise. Users\nmay want to avoid this comparison if for example the restarts are made from a\nrun with a different mask_table than the current run, in which case the\nchecksums will not match and cause crash.\n",
2987+
"datatype": "logical",
2988+
"value": "$TEST"
29842989
}
29852990
},
29862991
"KPP": {

‎param_templates/json/diag_table.json‎

Lines changed: 66 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,14 @@
99
"so",
1010
"KE",
1111
"MEKE",
12-
"rhopot0"
12+
"rhopot0",
13+
"rhopot2",
14+
"difvho",
15+
"difvso",
16+
"Kv_u",
17+
"Kv_v",
18+
"taux_bot",
19+
"tauy_bot"
1320
],
1421
[
1522
"uo",
@@ -19,12 +26,18 @@
1926
"so",
2027
"agessc",
2128
"rhopot0",
22-
"N2_int"
29+
"N2_int",
30+
"rhopot2",
31+
"difvho",
32+
"difvso",
33+
"Kv_u",
34+
"Kv_v"
2335
],
2436
[
2537
"thetao",
2638
"so",
27-
"agessc"
39+
"agessc",
40+
"e"
2841
],
2942
[
3043
"soga",
@@ -192,6 +205,18 @@
192205
],
193206
[
194207
"Geo_heat"
208+
],
209+
[
210+
"frunoff_glc",
211+
"lrunoff_glc"
212+
],
213+
[
214+
"KPP_QminusSW",
215+
"KPP_netSalt",
216+
"KPP_NLT_dTdt",
217+
"KPP_NLT_dSdt",
218+
"KPP_NLT_temp_budget",
219+
"KPP_NLT_saln_budget"
195220
]
196221
],
197222
"Files": {
@@ -230,7 +255,8 @@
230255
[
231256
"thetao",
232257
"so",
233-
"agessc"
258+
"agessc",
259+
"e"
234260
]
235261
],
236262
"lists2": {
@@ -312,7 +338,14 @@
312338
"so",
313339
"KE",
314340
"MEKE",
315-
"rhopot0"
341+
"rhopot0",
342+
"rhopot2",
343+
"difvho",
344+
"difvso",
345+
"Kv_u",
346+
"Kv_v",
347+
"taux_bot",
348+
"tauy_bot"
316349
],
317350
[
318351
"KPP_OBLdepth:oml",
@@ -387,6 +420,26 @@
387420
"u10_sqr"
388421
]
389422
]
423+
},
424+
"lists4": {
425+
"$COMP_ATM == \"cam\"": [
426+
[
427+
"frunoff_glc",
428+
"lrunoff_glc"
429+
]
430+
]
431+
},
432+
"lists5": {
433+
"$TEST == True": [
434+
[
435+
"KPP_QminusSW",
436+
"KPP_netSalt",
437+
"KPP_NLT_dTdt",
438+
"KPP_NLT_dSdt",
439+
"KPP_NLT_temp_budget",
440+
"KPP_NLT_saln_budget"
441+
]
442+
]
390443
}
391444
}
392445
}
@@ -422,7 +475,12 @@
422475
"so",
423476
"agessc",
424477
"rhopot0",
425-
"N2_int"
478+
"N2_int",
479+
"rhopot2",
480+
"difvho",
481+
"difvso",
482+
"Kv_u",
483+
"Kv_v"
426484
],
427485
[
428486
"volcello",
@@ -447,7 +505,7 @@
447505
},
448506
"surface_avg": {
449507
"suffix": {
450-
"$TEST == True": "h.sfc%4yr-%2mo-2dy",
508+
"$TEST == True": "h.sfc%4yr-%2mo-%2dy",
451509
"else": "h.sfc%4yr-%2mo"
452510
},
453511
"output_freq": {
@@ -464,7 +522,7 @@
464522
"reduction_method": "mean",
465523
"regional_section": "none",
466524
"fields": {
467-
"$OCN_DIAG_MODE != \"none\" and $TEST is not True": {
525+
"$OCN_DIAG_MODE != \"none\"": {
468526
"module": "ocean_model",
469527
"packing": "= 1 if $TEST else 2",
470528
"lists": [

0 commit comments

Comments
 (0)