diff --git a/.testing/README.md b/.testing/README.md index a9289a87dd..5cd190ef25 100644 --- a/.testing/README.md +++ b/.testing/README.md @@ -56,7 +56,7 @@ Model state is currently defined by the `ocean.stats` output file, which reports the total energy (per unit mass) at machine precision alongside similar global metrics, such as mass or mean sea level, at lower precision. -Clhecksums for every available diagnostic are also compared and the Makefile +Checksums for every available diagnostic are also compared and the Makefile will report any differences, but such differences are not yet considered a fail condition. @@ -138,7 +138,7 @@ This will run through the following tests: - `test.restarts`: Resubmission by restarts - `test.repros`: Optimized (REPRO) and unoptimized (DEBUG) compilation - `test.nans`: NaN initialization of allocated arrays -- `test.dims`: Dimensional scaling (length, time, thichkness, depth) +- `test.dims`: Dimensional scaling (length, time, thickness, depth) To enable the regression tests, use `DO_REGRESSION_TEST=true`. ``` @@ -159,10 +159,13 @@ fail if the answers differ from this build. The following test configurations (TCs) are supported: -- TC0: Unit testing of various model components, based on `unit_tests` -- TC1: A low-resolution version of the `benchmark` configuration -- TC2: An ALE configuration based on TC1 -- TC3: An open-boundary condition (OBC) test based on `circle_obcs` +- tc0: Unit testing of various model components, based on `unit_tests` +- tc1: A low-resolution version of the `benchmark` configuration + - tc1.a: Use the un-split mode with Runge-Kutta 3 time integration + - tc1.b: Use the un-split mode with Runge-Kutta 2 time integration +- tc2: An ALE configuration based on tc1 with tides + - tc2.a: Use sigma, PPM_H4 and no tides +- tc3: An open-boundary condition (OBC) test based on `circle_obcs` ## Code coverage @@ -170,7 +173,7 @@ The following test configurations (TCs) are supported: Code coverage reports the lines of code which have been tested, and can explicitly demonstrate when a particular operation is untested. -Coverage is measued using `gcov` and is reported for TCs using the `symmetric` +Coverage is measured using `gcov` and is reported for TCs using the `symmetric` executable. Coverage reporting is optionally sent to the `codecov.io` site. diff --git a/.testing/tc1.b/MOM_input b/.testing/tc1.b/MOM_input new file mode 120000 index 0000000000..dca928737e --- /dev/null +++ b/.testing/tc1.b/MOM_input @@ -0,0 +1 @@ +../tc1/MOM_input \ No newline at end of file diff --git a/.testing/tc1.b/MOM_override b/.testing/tc1.b/MOM_override new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.testing/tc1.b/MOM_tc_variant b/.testing/tc1.b/MOM_tc_variant new file mode 100644 index 0000000000..8d821691f3 --- /dev/null +++ b/.testing/tc1.b/MOM_tc_variant @@ -0,0 +1,2 @@ +#override SPLIT=False +#override USE_RK2=True diff --git a/.testing/tc1.b/diag_table b/.testing/tc1.b/diag_table new file mode 120000 index 0000000000..bf2ad677b6 --- /dev/null +++ b/.testing/tc1.b/diag_table @@ -0,0 +1 @@ +../tc1/diag_table \ No newline at end of file diff --git a/.testing/tc1.b/input.nml b/.testing/tc1.b/input.nml new file mode 100644 index 0000000000..3c7dcf7bea --- /dev/null +++ b/.testing/tc1.b/input.nml @@ -0,0 +1,20 @@ +&mom_input_nml + output_directory = './' + input_filename = 'n' + restart_input_dir = 'INPUT/' + restart_output_dir = 'RESTART/' + parameter_filename = + 'MOM_input', + 'MOM_tc_variant', + 'MOM_override', +/ + +&diag_manager_nml +/ + +&fms_nml + clock_grain = 'ROUTINE' + clock_flags = 'SYNC' + domains_stack_size = 955296 + stack_size = 0 +/ diff --git a/.testing/tc2.a/MOM_input b/.testing/tc2.a/MOM_input new file mode 120000 index 0000000000..b0cf8cd51c --- /dev/null +++ b/.testing/tc2.a/MOM_input @@ -0,0 +1 @@ +../tc2/MOM_input \ No newline at end of file diff --git a/.testing/tc2.a/MOM_override b/.testing/tc2.a/MOM_override new file mode 100644 index 0000000000..e69de29bb2 diff --git a/.testing/tc2.a/MOM_tc_variant b/.testing/tc2.a/MOM_tc_variant new file mode 100644 index 0000000000..d48fa53507 --- /dev/null +++ b/.testing/tc2.a/MOM_tc_variant @@ -0,0 +1,3 @@ +#override TOPO_CONFIG = "spoon" +#override REMAPPING_SCHEME = "PPM_H4" +#override REGRIDDING_COORDINATE_MODE = "SIGMA" diff --git a/.testing/tc2.a/diag_table b/.testing/tc2.a/diag_table new file mode 120000 index 0000000000..fcf2284f5f --- /dev/null +++ b/.testing/tc2.a/diag_table @@ -0,0 +1 @@ +../tc2/diag_table \ No newline at end of file diff --git a/.testing/tc2.a/input.nml b/.testing/tc2.a/input.nml new file mode 100644 index 0000000000..3c7dcf7bea --- /dev/null +++ b/.testing/tc2.a/input.nml @@ -0,0 +1,20 @@ +&mom_input_nml + output_directory = './' + input_filename = 'n' + restart_input_dir = 'INPUT/' + restart_output_dir = 'RESTART/' + parameter_filename = + 'MOM_input', + 'MOM_tc_variant', + 'MOM_override', +/ + +&diag_manager_nml +/ + +&fms_nml + clock_grain = 'ROUTINE' + clock_flags = 'SYNC' + domains_stack_size = 955296 + stack_size = 0 +/ diff --git a/.testing/tc2/MOM_input b/.testing/tc2/MOM_input index 9b36f2675c..c037648d95 100644 --- a/.testing/tc2/MOM_input +++ b/.testing/tc2/MOM_input @@ -319,18 +319,6 @@ SMAG_BI_CONST = 0.06 ! [nondim] default = 0.0 ENERGETICS_SFC_PBL = True DO_GEOTHERMAL = True GEOTHERMAL_SCALE = 0.05 -TIDES = True -TIDE_M2 = True -TIDE_S2 = True -TIDE_N2 = True -TIDE_K2 = True -TIDE_K1 = True -TIDE_O1 = True -TIDE_P1 = True -TIDE_Q1 = True -TIDE_MF = True -TIDE_MM = True -TIDE_SAL_SCALAR_VALUE = 1. USE_NEUTRAL_DIFFUSION = True DYNAMIC_VISCOUS_ML = True ! [Boolean] default = False ! If true, use a bulk Richardson number criterion to diff --git a/.testing/tc2/MOM_tc_variant b/.testing/tc2/MOM_tc_variant new file mode 100644 index 0000000000..8cdbf69de8 --- /dev/null +++ b/.testing/tc2/MOM_tc_variant @@ -0,0 +1,12 @@ +TIDES = True +TIDE_M2 = True +TIDE_S2 = True +TIDE_N2 = True +TIDE_K2 = True +TIDE_K1 = True +TIDE_O1 = True +TIDE_P1 = True +TIDE_Q1 = True +TIDE_MF = True +TIDE_MM = True +TIDE_SAL_SCALAR_VALUE = 1. diff --git a/.testing/tc2/input.nml b/.testing/tc2/input.nml index 54b26920b1..3c7dcf7bea 100644 --- a/.testing/tc2/input.nml +++ b/.testing/tc2/input.nml @@ -5,6 +5,7 @@ restart_output_dir = 'RESTART/' parameter_filename = 'MOM_input', + 'MOM_tc_variant', 'MOM_override', /