Skip to content

Commit 663b791

Browse files
mom6botmom6bot
committed
MOM6: Added the WENO schemes to reconstruct PV in MOM_CoriolisAdv (#946)
- NOAA-GFDL/MOM6@b0fa0c00e Added the WENO schemes to reconstruct PV in MOM_CoriolisAdv (#946)
1 parent b751102 commit 663b791

File tree

79 files changed

+282
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+282
-72
lines changed

‎coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY"
10821082
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
10831083
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
10841084
! Arakawa & Hsu and Sadourny energy
1085+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1086+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1087+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
10851088
BOUND_CORIOLIS = True ! [Boolean] default = False
10861089
! If true, the Coriolis terms at u-points are bounded by the four estimates of
10871090
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1090,7 +1093,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
10901093
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
10911094
! KE_SCHEME selects the discretization for acceleration due to the kinetic
10921095
! energy gradient. Valid values are:
1093-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1096+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
10941097
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
10951098
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
10961099
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY"
10821082
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
10831083
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
10841084
! Arakawa & Hsu and Sadourny energy
1085+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1086+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1087+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
10851088
BOUND_CORIOLIS = True ! [Boolean] default = False
10861089
! If true, the Coriolis terms at u-points are bounded by the four estimates of
10871090
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1090,7 +1093,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
10901093
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
10911094
! KE_SCHEME selects the discretization for acceleration due to the kinetic
10921095
! energy gradient. Valid values are:
1093-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1096+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
10941097
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
10951098
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
10961099
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY"
10821082
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
10831083
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
10841084
! Arakawa & Hsu and Sadourny energy
1085+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1086+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1087+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
10851088
BOUND_CORIOLIS = True ! [Boolean] default = False
10861089
! If true, the Coriolis terms at u-points are bounded by the four estimates of
10871090
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1090,7 +1093,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
10901093
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
10911094
! KE_SCHEME selects the discretization for acceleration due to the kinetic
10921095
! energy gradient. Valid values are:
1093-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1096+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
10941097
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
10951098
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
10961099
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎ice_ocean_SIS2/Baltic/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,6 +1082,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY"
10821082
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
10831083
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
10841084
! Arakawa & Hsu and Sadourny energy
1085+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1086+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1087+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
10851088
BOUND_CORIOLIS = True ! [Boolean] default = False
10861089
! If true, the Coriolis terms at u-points are bounded by the four estimates of
10871090
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1090,7 +1093,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
10901093
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
10911094
! KE_SCHEME selects the discretization for acceleration due to the kinetic
10921095
! energy gradient. Valid values are:
1093-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1096+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
10941097
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
10951098
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
10961099
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,6 +1249,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENERGY" ! default = "SADOURNY75_ENERGY"
12491249
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
12501250
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
12511251
! Arakawa & Hsu and Sadourny energy
1252+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1253+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1254+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
12521255
BOUND_CORIOLIS = True ! [Boolean] default = False
12531256
! If true, the Coriolis terms at u-points are bounded by the four estimates of
12541257
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1257,7 +1260,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
12571260
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
12581261
! KE_SCHEME selects the discretization for acceleration due to the kinetic
12591262
! energy gradient. Valid values are:
1260-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1263+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
12611264
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
12621265
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
12631266
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1345,6 +1345,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY"
13451345
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
13461346
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
13471347
! Arakawa & Hsu and Sadourny energy
1348+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1349+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1350+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
13481351
BOUND_CORIOLIS = True ! [Boolean] default = False
13491352
! If true, the Coriolis terms at u-points are bounded by the four estimates of
13501353
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1353,7 +1356,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
13531356
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
13541357
! KE_SCHEME selects the discretization for acceleration due to the kinetic
13551358
! energy gradient. Valid values are:
1356-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1359+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
13571360
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
13581361
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
13591362
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY"
416416
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
417417
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
418418
! Arakawa & Hsu and Sadourny energy
419+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
420+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
421+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
419422
BOUND_CORIOLIS = True ! [Boolean] default = False
420423
! If true, the Coriolis terms at u-points are bounded by the four estimates of
421424
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This

‎ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1359,6 +1359,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY"
13591359
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
13601360
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
13611361
! Arakawa & Hsu and Sadourny energy
1362+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1363+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1364+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
13621365
BOUND_CORIOLIS = True ! [Boolean] default = False
13631366
! If true, the Coriolis terms at u-points are bounded by the four estimates of
13641367
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1367,7 +1370,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
13671370
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
13681371
! KE_SCHEME selects the discretization for acceleration due to the kinetic
13691372
! energy gradient. Valid values are:
1370-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1373+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
13711374
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
13721375
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
13731376
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

‎ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY"
433433
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
434434
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
435435
! Arakawa & Hsu and Sadourny energy
436+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
437+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
438+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
436439
BOUND_CORIOLIS = True ! [Boolean] default = False
437440
! If true, the Coriolis terms at u-points are bounded by the four estimates of
438441
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This

‎ice_ocean_SIS2/Baltic_OM5_025/MOM_parameter_doc.all

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1332,6 +1332,9 @@ CORIOLIS_SCHEME = "SADOURNY75_ENSTRO" ! default = "SADOURNY75_ENERGY"
13321332
! ARAKAWA_LAMB81 - Arakawa & Lamb, 1981; En. + Enst.
13331333
! ARAKAWA_LAMB_BLEND - A blend of Arakawa & Lamb with
13341334
! Arakawa & Hsu and Sadourny energy
1335+
! WENOVI5TH_PV_ENSTRO - 5th-order WENO PV enstrophy
1336+
! WENOVI3RD_PV_ENSTRO - 3rd-order WENO PV enstrophy
1337+
! WENOVI7TH_PV_ENSTRO - 7th-order WENO PV enstrophy
13351338
BOUND_CORIOLIS = True ! [Boolean] default = False
13361339
! If true, the Coriolis terms at u-points are bounded by the four estimates of
13371340
! (f+rv)v from the four neighboring v-points, and similarly at v-points. This
@@ -1340,7 +1343,7 @@ BOUND_CORIOLIS = True ! [Boolean] default = False
13401343
KE_SCHEME = "KE_ARAKAWA" ! default = "KE_ARAKAWA"
13411344
! KE_SCHEME selects the discretization for acceleration due to the kinetic
13421345
! energy gradient. Valid values are:
1343-
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV
1346+
! KE_ARAKAWA, KE_SIMPLE_GUDONOV, KE_GUDONOV, KE_UP3
13441347
PV_ADV_SCHEME = "PV_ADV_CENTERED" ! default = "PV_ADV_CENTERED"
13451348
! PV_ADV_SCHEME selects the discretization for PV advection. Valid values are:
13461349
! PV_ADV_CENTERED - centered (aka Sadourny, 75)

0 commit comments

Comments
 (0)