Merge branch 'near_surface_fluxes' into LBD_merge

.gitignore

@@ -6,16 +6,3 @@ html
 MOM6
 build/
 deps/
-#.testing/*/available_diags.*
-#.testing/*/CPU_stats
-#.testing/*/chksum_diag
-#.testing/*/exitcode
-#.testing/*/logfile.*.out
-#.testing/*/MOM_parameter_doc.*
-#.testing/*/ocean_geometry.nc
-#.testing/*/ocean.stats
-#.testing/*/ocean.stats.nc
-#.testing/*/RESTART/
-#.testing/*/time_stamp.out
-#.testing/*/Vertical_coordinate.nc
-#.testing/*/GOLD_IC.nc

.testing/.gitignore

@@ -5,9 +5,11 @@ exitcode
 logfile.*.out
 MOM_parameter_doc.*
 ocean_geometry.nc
-ocean.stats
-ocean.stats.nc
+ocean.stats*
 RESTART/
 time_stamp.out
 Vertical_coordinate.nc
 GOLD_IC.nc
+debug.out
+chksum_diag.*
+config.mk

.testing/Makefile

@@ -37,7 +37,7 @@ MKMF_TEMPLATE ?= $(DEPS)/mkmf/templates/ncrc-gnu.mk
 
 # Executables
 BUILDS = symmetric asymmetric repro
-CONFIGS := $(foreach n,$(shell seq 0 3),tc$(n))
+CONFIGS := $(wildcard tc*)
 TESTS = grids layouts restarts repros nans dims
 
 # The following variables are configured by Travis:

.testing/tc0/diag_table

@@ -1,2 +1,2 @@
-"Unit tests"
+"MOM test configuration 0"
 1 1 1 0 0 0

.testing/tc1.a/MOM_input

@@ -0,0 +1 @@
+../tc1/MOM_input

.testing/tc1.a/MOM_tc_variant

@@ -0,0 +1 @@
+#override SPLIT=False

.testing/tc1.a/diag_table

@@ -0,0 +1 @@
+../tc1/diag_table

.testing/tc1.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
+/

.testing/tc1/diag_table

@@ -1,86 +1,10 @@
-"MOM benchmark Experiment"
+"MOM test configuration 1"
 1 1 1 0 0 0
 "prog",      1,"days",1,"days","time",
-#"ave_prog", 5,"days",1,"days","Time",365,"days"
-#"cont",     5,"days",1,"days","Time",365,"days"
-
-#This is the field section of the diag_table.
 
 # Prognostic Ocean fields:
-#=========================
-
 "ocean_model","u","u","prog","all",.false.,"none",2
 "ocean_model","v","v","prog","all",.false.,"none",2
 "ocean_model","h","h","prog","all",.false.,"none",1
 "ocean_model","e","e","prog","all",.false.,"none",2
 "ocean_model","temp","temp","prog","all",.false.,"none",2
-#"ocean_model","salt","salt","prog","all",.false.,"none",2
-
-#"ocean_model","u","u","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","v","v","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","h","h","ave_prog_%4yr_%3dy","all",.true.,"none",1
-#"ocean_model","e","e","ave_prog_%4yr_%3dy","all",.true.,"none",2
-
-# Auxilary Tracers:
-#==================
-#"ocean_model","vintage","vintage","prog_%4yr_%3dy","all",.false.,"none",2
-#"ocean_model","age","age","prog_%4yr_%3dy","all",.false.,"none",2
-
-# Continuity Equation Terms:
-#===========================
-#"ocean_model","dhdt","dhdt","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","wd","wd","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uh","uh","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vh","vh","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","h_rho","h_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uh_rho","uh_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vh_rho","vh_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uhGM_rho","uhGM_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vhGM_rho","vhGM_rho","cont_%4yr_%3dy","all",.true.,"none",2
-
-#
-# Tracer Fluxes:
-#==================
-#"ocean_model","T_adx",  "T_adx",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_ady",  "T_ady",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_diffx","T_diffx","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_diffy","T_diffy","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_adx",  "S_adx",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_ady",  "S_ady",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_diffx","S_diffx","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_diffy","S_diffy","ave_prog_%4yr_%3dy","all",.true.,"none",2
-
-#=============================================================================================
-#
-#===- This file can be used with diag_manager/v2.0a (or higher) ====
-#
-#
-#  FORMATS FOR FILE ENTRIES (not all input values are used)
-#  ------------------------
-#
-#"file_name", output_freq, "output_units", format, "time_units", "time_long_name", ...
-#   (opt) new_file_frequecy, (opt) "new_file_freq_units", "new_file_start_date"
-#
-#
-#output_freq:  > 0  output frequency in "output_units"
-#              = 0  output frequency every time step
-#              =-1  output frequency at end of run
-#
-#output_units = units used for output frequency
-#               (years, months, days, minutes, hours, seconds)
-#
-#time_units   = units used to label the time axis
-#               (days, minutes, hours, seconds)
-#
-#
-#  FORMAT FOR FIELD ENTRIES (not all input values are used)
-#  ------------------------
-#
-#"module_name", "field_name", "output_name", "file_name" "time_sampling", time_avg, "other_opts", packing
-#
-#time_avg = .true. or .false.
-#
-#packing  = 1  double precision
-#         = 2  float
-#         = 4  packed 16-bit integers
-#         = 8  packed 1-byte (not tested?)

.testing/tc2/diag_table

@@ -1,86 +1,2 @@
-"MOM benchmark Experiment"
+"MOM test configuration 2"
 1 1 1 0 0 0
-"prog",      1,"days",1,"days","time",
-#"ave_prog", 5,"days",1,"days","Time",365,"days"
-#"cont",     5,"days",1,"days","Time",365,"days"
-
-#This is the field section of the diag_table.
-
-# Prognostic Ocean fields:
-#=========================
-
-"ocean_model","u","u","prog","all",.false.,"none",2
-"ocean_model","v","v","prog","all",.false.,"none",2
-"ocean_model","h","h","prog","all",.false.,"none",1
-"ocean_model","e","e","prog","all",.false.,"none",2
-"ocean_model","temp","temp","prog","all",.false.,"none",2
-#"ocean_model","salt","salt","prog","all",.false.,"none",2
-
-#"ocean_model","u","u","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","v","v","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","h","h","ave_prog_%4yr_%3dy","all",.true.,"none",1
-#"ocean_model","e","e","ave_prog_%4yr_%3dy","all",.true.,"none",2
-
-# Auxilary Tracers:
-#==================
-#"ocean_model","vintage","vintage","prog_%4yr_%3dy","all",.false.,"none",2
-#"ocean_model","age","age","prog_%4yr_%3dy","all",.false.,"none",2
-
-# Continuity Equation Terms:
-#===========================
-#"ocean_model","dhdt","dhdt","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","wd","wd","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uh","uh","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vh","vh","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","h_rho","h_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uh_rho","uh_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vh_rho","vh_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","uhGM_rho","uhGM_rho","cont_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","vhGM_rho","vhGM_rho","cont_%4yr_%3dy","all",.true.,"none",2
-
-#
-# Tracer Fluxes:
-#==================
-#"ocean_model","T_adx",  "T_adx",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_ady",  "T_ady",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_diffx","T_diffx","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","T_diffy","T_diffy","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_adx",  "S_adx",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_ady",  "S_ady",  "ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_diffx","S_diffx","ave_prog_%4yr_%3dy","all",.true.,"none",2
-#"ocean_model","S_diffy","S_diffy","ave_prog_%4yr_%3dy","all",.true.,"none",2
-
-#=============================================================================================
-#
-#===- This file can be used with diag_manager/v2.0a (or higher) ====
-#
-#
-#  FORMATS FOR FILE ENTRIES (not all input values are used)
-#  ------------------------
-#
-#"file_name", output_freq, "output_units", format, "time_units", "time_long_name", ...
-#   (opt) new_file_frequecy, (opt) "new_file_freq_units", "new_file_start_date"
-#
-#
-#output_freq:  > 0  output frequency in "output_units"
-#              = 0  output frequency every time step
-#              =-1  output frequency at end of run
-#
-#output_units = units used for output frequency
-#               (years, months, days, minutes, hours, seconds)
-#
-#time_units   = units used to label the time axis
-#               (days, minutes, hours, seconds)
-#
-#
-#  FORMAT FOR FIELD ENTRIES (not all input values are used)
-#  ------------------------
-#
-#"module_name", "field_name", "output_name", "file_name" "time_sampling", time_avg, "other_opts", packing
-#
-#time_avg = .true. or .false.
-#
-#packing  = 1  double precision
-#         = 2  float
-#         = 4  packed 16-bit integers
-#         = 8  packed 1-byte (not tested?)

.testing/tc3/MOM_input

@@ -35,11 +35,11 @@ NJHALO = 4                      ! default = 2
                                 ! y-direction.  With STATIC_MEMORY_ this is set as NJHALO_
                                 ! in MOM_memory.h at compile time; without STATIC_MEMORY_
                                 ! the default is NJHALO_ in MOM_memory.h (if defined) or 2.
-NIGLOBAL = 25                   !
+NIGLOBAL = 13                   !
                                 ! The total number of thickness grid points in the
                                 ! x-direction in the physical domain. With STATIC_MEMORY_
                                 ! this is set in MOM_memory.h at compile time.
-NJGLOBAL = 25                   !
+NJGLOBAL = 13                   !
                                 ! The total number of thickness grid points in the
                                 ! y-direction in the physical domain. With STATIC_MEMORY_
                                 ! this is set in MOM_memory.h at compile time.