Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

User/bgr/ideal hurricane #251

Merged
merged 10 commits into from
Oct 22, 2018
Merged

User/bgr/ideal hurricane #251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
93be8ff
Adding new ideal_hurricane test case
Aug 17, 2018
f95ad83
Updating input files in CVMix test cases
Oct 14, 2018
e500d54
Update to SCM_idealized_hurricane test case MOM_input file.
Oct 14, 2018
158d51d
Renamed CVmix_SCM_tests folder to CVMix_SCM_tests
Oct 14, 2018
d1f5614
Merge branch 'IdealHurricane' into user/bgr/ideal_hurricane
Oct 14, 2018
df8432a
Modifications to run the idealized_hurricane (3d) test case.
Oct 14, 2018
a022d67
Merge branch 'dev/gfdl' into user/bgr/ideal_hurricane
Oct 17, 2018
8297256
Updated CVMix_SCM_tests skin_warming_wind case for interior dtdz=0 (a…
Oct 17, 2018
11296a5
Updates to input parameters inidealized_hurricane test case
Oct 17, 2018
871ef70
Reverting rename of 'CVmix_SCM_tests' to 'CVMix_SCM_tests'.
Oct 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions ocean_only/CVmix_SCM_tests/common_BML/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ THICKNESS_CONFIG = "uniform" !
! seamount - TBD AJA.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -206,16 +206,20 @@ TS_CONFIG = "SCM_ideal_hurr" !
! benchmark - use the benchmark test case T & S.
! linear - linear in logical layer space.
! DOME2D - 2D DOME initialization.
! adjustment2d - TBD AJA.
! sloshing - TBD AJA.
! seamount - TBD AJA.
! ISOMIP - ISOMIP initialization.
! adjustment2d - 2d lock exchange T/S ICs.
! sloshing - sloshing mode T/S ICs.
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2

! === module MOM_MEKE ===

Expand Down
22 changes: 13 additions & 9 deletions ocean_only/CVmix_SCM_tests/common_EPBL/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ THICKNESS_CONFIG = "coord" !
! seamount - TBD AJA.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -204,16 +204,20 @@ TS_CONFIG = "SCM_ideal_hurr" !
! benchmark - use the benchmark test case T & S.
! linear - linear in logical layer space.
! DOME2D - 2D DOME initialization.
! adjustment2d - TBD AJA.
! sloshing - TBD AJA.
! seamount - TBD AJA.
! ISOMIP - ISOMIP initialization.
! adjustment2d - 2d lock exchange T/S ICs.
! sloshing - sloshing mode T/S ICs.
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2

! === module MOM_MEKE ===

Expand Down
22 changes: 13 additions & 9 deletions ocean_only/CVmix_SCM_tests/common_KPP/MOM_input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ THICKNESS_CONFIG = "coord" !
! seamount - TBD AJA.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -204,16 +204,20 @@ TS_CONFIG = "SCM_ideal_hurr" !
! benchmark - use the benchmark test case T & S.
! linear - linear in logical layer space.
! DOME2D - 2D DOME initialization.
! adjustment2d - TBD AJA.
! sloshing - TBD AJA.
! seamount - TBD AJA.
! ISOMIP - ISOMIP initialization.
! adjustment2d - 2d lock exchange T/S ICs.
! sloshing - sloshing mode T/S ICs.
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2

! === module MOM_MEKE ===

Expand Down
29 changes: 19 additions & 10 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ THICKNESS_CONFIG = "uniform" !
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -439,17 +439,26 @@ TS_CONFIG = "SCM_ideal_hurr" !
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_S_REF = 35.0 ! [1e-3] default = 35.0
! Reference salinity
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_DTDZ = 0.01 ! [C/m]
! Initial temperature stratification below mixed layer
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_TEMP_MLD = 0.0 ! [m] default = 0.0
! Initial temp mixed layer depth
SCM_SALT_MLD = 0.0 ! [m] default = 0.0
! Initial salt mixed layer depth
SCM_L1_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2
SCM_L2_DSDZ = 0.0 ! [PPT/m] default = 0.0
! Initial salinity stratification in layer 2
SCM_L2_MINTEMP = 4.0 ! [C] default = 4.0
! Layer 2 minimum temperature
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities
! are specified for a new run:
Expand Down
15 changes: 7 additions & 8 deletions ocean_only/CVmix_SCM_tests/cooling_only/BML/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ THICKNESS_CONFIG = "uniform" !
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -197,15 +197,14 @@ TS_CONFIG = "SCM_ideal_hurr" !
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_DTDZ = 0.01 ! [C/m]
! Initial temperature stratification below mixed layer
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2

! === module MOM_diag_mediator ===

Expand Down
29 changes: 19 additions & 10 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ THICKNESS_CONFIG = "coord" !
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -519,17 +519,26 @@ TS_CONFIG = "SCM_ideal_hurr" !
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_S_REF = 35.0 ! [1e-3] default = 35.0
! Reference salinity
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_DTDZ = 0.01 ! [C/m]
! Initial temperature stratification below mixed layer
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_TEMP_MLD = 0.0 ! [m] default = 0.0
! Initial temp mixed layer depth
SCM_SALT_MLD = 0.0 ! [m] default = 0.0
! Initial salt mixed layer depth
SCM_L1_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2
SCM_L2_DSDZ = 0.0 ! [PPT/m] default = 0.0
! Initial salinity stratification in layer 2
SCM_L2_MINTEMP = 4.0 ! [C] default = 4.0
! Layer 2 minimum temperature
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities
! are specified for a new run:
Expand Down
15 changes: 7 additions & 8 deletions ocean_only/CVmix_SCM_tests/cooling_only/EPBL/MOM_parameter_doc.short
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ THICKNESS_CONFIG = "coord" !
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -215,15 +215,14 @@ TS_CONFIG = "SCM_ideal_hurr" !
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_DTDZ = 0.01 ! [C/m]
! Initial temperature stratification below mixed layer
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2

! === module MOM_diag_mediator ===

Expand Down
29 changes: 19 additions & 10 deletions ocean_only/CVmix_SCM_tests/cooling_only/KPP/MOM_parameter_doc.all
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ THICKNESS_CONFIG = "coord" !
! soliton - Equatorial Rossby soliton.
! rossby_front - a mixed layer front in thermal wind balance.
! USER - call a user modified routine.
TS_CONFIG = "SCM_ideal_hurr" !
TS_CONFIG = "SCM_CVMix_tests" !
! A string that determines how the initial tempertures
! and salinities are specified for a new run:
! file - read velocities from the file specified
Expand All @@ -519,17 +519,26 @@ TS_CONFIG = "SCM_ideal_hurr" !
! seamount - no motion test with seamount ICs.
! dumbbell - sloshing channel ICs.
! rossby_front - a mixed layer front in thermal wind balance.
! SCM_ideal_hurr - used in the SCM idealized hurricane test.
! SCM_CVMix_tests - used in the SCM CVMix tests.
! USER - call a user modified routine.
SCM_S_REF = 35.0 ! [1e-3] default = 35.0
! Reference salinity
SCM_SST_REF = 15.0 ! [C]
! Reference surface temperature
SCM_DTDZ = 0.01 ! [C/m]
! Initial temperature stratification below mixed layer
SCM_MLD = 0.0 ! [m]
! Initial mixed layer depth
SCM_TEMP_MLD = 0.0 ! [m] default = 0.0
! Initial temp mixed layer depth
SCM_SALT_MLD = 0.0 ! [m] default = 0.0
! Initial salt mixed layer depth
SCM_L1_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L1_TEMP = 15.0 ! [C] default = 20.0
! Layer 1 surface temperature
SCM_L2_SALT = 35.0 ! [1e-3] default = 35.0
! Layer 2 surface salinity
SCM_L2_TEMP = 15.0 ! [C] default = 20.0
! Layer 2 surface temperature
SCM_L2_DTDZ = 0.01 ! [C/m] default = 0.0
! Initial temperature stratification in layer 2
SCM_L2_DSDZ = 0.0 ! [PPT/m] default = 0.0
! Initial salinity stratification in layer 2
SCM_L2_MINTEMP = 4.0 ! [C] default = 4.0
! Layer 2 minimum temperature
VELOCITY_CONFIG = "zero" ! default = "zero"
! A string that determines how the initial velocities
! are specified for a new run:
Expand Down
Loading