Merge branch 'dev/master' into user/nnz/EddyKineticEnergyAnalysisScript

Conflicts: Resolved
	tools/analysis/m6plot.py

config_src/coupled_driver/MOM_surface_forcing.F90

@@ -678,12 +678,12 @@ subroutine forcing_save_restart(CS, G, Time, directory, time_stamped, &
 end subroutine forcing_save_restart
 
 subroutine surface_forcing_init(Time, G, param_file, diag, CS, restore_salt)
-  type(time_type),          intent(in) :: Time
-  type(ocean_grid_type),    intent(in) :: G
-  type(param_file_type),    intent(in) :: param_file
-  type(diag_ctrl), target,  intent(in) :: diag
-  type(surface_forcing_CS), pointer    :: CS
-  logical, optional,       intent(in) :: restore_salt
+  type(time_type),          intent(in)    :: Time
+  type(ocean_grid_type),    intent(in)    :: G
+  type(param_file_type),    intent(in)    :: param_file
+  type(diag_ctrl), target,  intent(inout) :: diag
+  type(surface_forcing_CS), pointer       :: CS
+  logical, optional,        intent(in)    :: restore_salt
 ! Arguments: Time - The current model time.
 !  (in)      G - The ocean's grid structure.
 !  (in)      param_file - A structure indicating the open file to parse for

config_src/solo_driver/MOM_surface_forcing.F90

@@ -1726,7 +1726,7 @@ subroutine surface_forcing_init(Time, G, param_file, diag, CS, tracer_flow_CSp)
   type(time_type),           intent(in) :: Time
   type(ocean_grid_type),     intent(in) :: G
   type(param_file_type),     intent(in) :: param_file
-  type(diag_ctrl), target,   intent(in) :: diag
+  type(diag_ctrl), target,intent(inout) :: diag
   type(surface_forcing_CS),  pointer    :: CS
   type(tracer_flow_control_CS), pointer :: tracer_flow_CSp
 ! Arguments: Time - The current model time.

examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.all

@@ -142,10 +142,6 @@ THICKNESSDIFFUSE = True         !   [Boolean] default = False
 THICKNESSDIFFUSE_FIRST = True   !   [Boolean] default = False
                                 ! If true, do thickness diffusion before dynamics.
                                 ! This is only used if THICKNESSDIFFUSE is true.
-MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
-                                ! If true, a density-gradient dependent re-stratifying
-                                ! flow is imposed in the mixed layer.
-                                ! This is only used if BULKMIXEDLAYER is true.
 DEBUG = False                   !   [Boolean] default = False
                                 ! If true, write out verbose debugging data.
 DEBUG_TRUNCATIONS = False       !   [Boolean] default = False
@@ -485,7 +481,8 @@ VELOCITY_CONFIG = "zero"        ! default = "zero"
                                 !       by (VELOCITY_FILE).
                                 !     zero - the fluid is initially at rest.
                                 !     uniform - the flow is uniform (determined by
-                                !       paremters TORUS_U and TORUS_V).
+                                !       parameters TORUS_U and TORUS_V).
+                                !     rossby_front - a mixed layer front in thermal wind balance.
                                 !     USER - call a user modified routine.
 CONVERT_THICKNESS_UNITS = False !   [Boolean] default = False
                                 ! If true,  convert the thickness initial conditions from
@@ -1028,6 +1025,10 @@ KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
                                 ! more sensible values of T & S into thin layers.
 
 ! === module MOM_mixed_layer_restrat ===
+MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
+                                ! If true, a density-gradient dependent re-stratifying
+                                ! flow is imposed in the mixed layer.
+                                ! This is only used if BULKMIXEDLAYER is true.
 FOX_KEMPER_ML_RESTRAT_COEF = 20.0 !   [nondim] default = 0.0
                                 ! A nondimensional coefficient that is proportional to
                                 ! the ratio of the deformation radius to the dominant

examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/MOM_parameter_doc.short

@@ -60,10 +60,6 @@ THICKNESSDIFFUSE = True         !   [Boolean] default = False
 THICKNESSDIFFUSE_FIRST = True   !   [Boolean] default = False
                                 ! If true, do thickness diffusion before dynamics.
                                 ! This is only used if THICKNESSDIFFUSE is true.
-MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
-                                ! If true, a density-gradient dependent re-stratifying
-                                ! flow is imposed in the mixed layer.
-                                ! This is only used if BULKMIXEDLAYER is true.
 DT = 3600.0                     !   [s]
                                 ! The (baroclinic) dynamics time step.  The time-step that
                                 ! is actually used will be an integer fraction of the
@@ -383,6 +379,10 @@ KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
                                 ! The maximum horizontal thickness diffusivity.
 
 ! === module MOM_mixed_layer_restrat ===
+MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
+                                ! If true, a density-gradient dependent re-stratifying
+                                ! flow is imposed in the mixed layer.
+                                ! This is only used if BULKMIXEDLAYER is true.
 FOX_KEMPER_ML_RESTRAT_COEF = 20.0 !   [nondim] default = 0.0
                                 ! A nondimensional coefficient that is proportional to
                                 ! the ratio of the deformation radius to the dominant

examples/coupled_AM2_LM3_SIS/AM2_MOM6i_1deg/diag_table

@@ -33,7 +33,7 @@ CM2.2
 #
 # Auxilary Tracers:
 #==================
-"ocean_model","vintage","vintage","ocean_month","all",.true.,"none",2
+#"ocean_model","vintage","vintage","ocean_month","all",.true.,"none",2
 "ocean_model","age","age","ocean_month","all",.true.,"none",2
 "ocean_model","CFC11","CFC11","ocean_month","all",.true.,"none",2
 "ocean_model","CFC12","CFC12","ocean_month","all",.true.,"none",2
@@ -137,8 +137,8 @@ CM2.2
 #"ocean_model","gKEv","gKEv","ocean_month","all",.true.,"none",2
 #"ocean_model","rvxu","rvxu","ocean_month","all",.true.,"none",2
 #"ocean_model","rvxv","rvxv","ocean_month","all",.true.,"none",2
-"ocean_model","PFu_bc","PFu_bc","ocean_month","all",.true.,"none",2
-"ocean_model","PFv_bc","PFv_bc","ocean_month","all",.true.,"none",2
+#"ocean_model","PFu_bc","PFu_bc","ocean_month","all",.true.,"none",2
+#"ocean_model","PFv_bc","PFv_bc","ocean_month","all",.true.,"none",2
 
 # Barotropic Momentum Balance Terms:
 # (only available with split time stepping.)
@@ -194,7 +194,7 @@ CM2.2
 "ocean_model","taux",     "taux",     "ocean_month","all",.true.,"none",2
 "ocean_model","tauy",     "tauy",     "ocean_month","all",.true.,"none",2
 "ocean_model","ustar",    "ustar",    "ocean_month","all",.true.,"none",2
-"ocean_model","PmE",      "PmE",      "ocean_month","all",.true.,"none",2
+"ocean_model","PRCmE",    "PRCmE",    "ocean_month","all",.true.,"none",2
 "ocean_model","SW",       "SW",       "ocean_month","all",.true.,"none",2
 "ocean_model","LwLatSens","LwLatSens","ocean_month","all",.true.,"none",2
 "ocean_model","p_surf",   "p_surf",   "ocean_month","all",.true.,"none",2
@@ -465,18 +465,18 @@ CM2.2
  "radiation","swnt_sfc_vis_cf",   "swnt_sfc_vis_cf",   "atmos_month_aer",  "all", .true.,"none", 2
  "radiation","swnt_sfc_1p6_cf",   "swnt_sfc_1p6_cf",   "atmos_month_aer",  "all", .true.,"none", 2
 
- "radiation", "bnd5_extopdep_vlcno", "bnd5_exopd_vl",     "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "lw_b5_extopdep_vlcno_c", "b5_exopd_vl_c",  "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "bnd6_lwext_vlcno", "bnd6_lwext_vl",        "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "bnd6_extopdep_vlcno_c", "bnd6_exopd_vl_c", "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "visband_swext_vlcno", "vis_swext_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "visband_swssa_vlcno", "vis_swssa_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "visband_swasy_vlcno", "vis_swasy_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "vis_extopdep_vlcno_c", "vis_exopd_vl_c",   "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "nirband_swext_vlcno", "nir_swext_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "nirband_swssa_vlcno", "nir_swssa_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "nirband_swasy_vlcno", "nir_swasy_vl",      "atmos_month_aer", "all", .true.,"none", 2
- "radiation", "nir_extopdep_vlcno_c", "nir_exopd_vl_c",   "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "bnd5_extopdep_vlcno", "bnd5_exopd_vl",     "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "lw_b5_extopdep_vlcno_c", "b5_exopd_vl_c",  "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "bnd6_lwext_vlcno", "bnd6_lwext_vl",        "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "bnd6_extopdep_vlcno_c", "bnd6_exopd_vl_c", "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "visband_swext_vlcno", "vis_swext_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "visband_swssa_vlcno", "vis_swssa_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "visband_swasy_vlcno", "vis_swasy_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "vis_extopdep_vlcno_c", "vis_exopd_vl_c",   "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "nirband_swext_vlcno", "nir_swext_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "nirband_swssa_vlcno", "nir_swssa_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "nirband_swasy_vlcno", "nir_swasy_vl",      "atmos_month_aer", "all", .true.,"none", 2
+#"radiation", "nir_extopdep_vlcno_c", "nir_exopd_vl_c",   "atmos_month_aer", "all", .true.,"none", 2
 
  "radiation", "small_dust",         "sm_dust",     "atmos_month_aer", "all", .true.,"none", 2
  "radiation", "small_dust_col",     "sm_dust_col", "atmos_month_aer", "all", .true.,"none", 2

examples/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.all

@@ -142,10 +142,6 @@ THICKNESSDIFFUSE = True         !   [Boolean] default = False
 THICKNESSDIFFUSE_FIRST = True   !   [Boolean] default = False
                                 ! If true, do thickness diffusion before dynamics.
                                 ! This is only used if THICKNESSDIFFUSE is true.
-MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
-                                ! If true, a density-gradient dependent re-stratifying
-                                ! flow is imposed in the mixed layer.
-                                ! This is only used if BULKMIXEDLAYER is true.
 DEBUG = False                   !   [Boolean] default = False
                                 ! If true, write out verbose debugging data.
 DEBUG_TRUNCATIONS = False       !   [Boolean] default = False
@@ -485,7 +481,8 @@ VELOCITY_CONFIG = "zero"        ! default = "zero"
                                 !       by (VELOCITY_FILE).
                                 !     zero - the fluid is initially at rest.
                                 !     uniform - the flow is uniform (determined by
-                                !       paremters TORUS_U and TORUS_V).
+                                !       parameters TORUS_U and TORUS_V).
+                                !     rossby_front - a mixed layer front in thermal wind balance.
                                 !     USER - call a user modified routine.
 CONVERT_THICKNESS_UNITS = False !   [Boolean] default = False
                                 ! If true,  convert the thickness initial conditions from
@@ -1028,6 +1025,10 @@ KD_SMOOTH = 1.0E-06             !   [not defined] default = 1.0E-06
                                 ! more sensible values of T & S into thin layers.
 
 ! === module MOM_mixed_layer_restrat ===
+MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
+                                ! If true, a density-gradient dependent re-stratifying
+                                ! flow is imposed in the mixed layer.
+                                ! This is only used if BULKMIXEDLAYER is true.
 FOX_KEMPER_ML_RESTRAT_COEF = 20.0 !   [nondim] default = 0.0
                                 ! A nondimensional coefficient that is proportional to
                                 ! the ratio of the deformation radius to the dominant

examples/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/MOM_parameter_doc.short

@@ -60,10 +60,6 @@ THICKNESSDIFFUSE = True         !   [Boolean] default = False
 THICKNESSDIFFUSE_FIRST = True   !   [Boolean] default = False
                                 ! If true, do thickness diffusion before dynamics.
                                 ! This is only used if THICKNESSDIFFUSE is true.
-MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
-                                ! If true, a density-gradient dependent re-stratifying
-                                ! flow is imposed in the mixed layer.
-                                ! This is only used if BULKMIXEDLAYER is true.
 DT = 3600.0                     !   [s]
                                 ! The (baroclinic) dynamics time step.  The time-step that
                                 ! is actually used will be an integer fraction of the
@@ -383,6 +379,10 @@ KHTH_MAX = 900.0                !   [m2 s-1] default = 0.0
                                 ! The maximum horizontal thickness diffusivity.
 
 ! === module MOM_mixed_layer_restrat ===
+MIXEDLAYER_RESTRAT = True       !   [Boolean] default = False
+                                ! If true, a density-gradient dependent re-stratifying
+                                ! flow is imposed in the mixed layer.
+                                ! This is only used if BULKMIXEDLAYER is true.
 FOX_KEMPER_ML_RESTRAT_COEF = 20.0 !   [nondim] default = 0.0
                                 ! A nondimensional coefficient that is proportional to
                                 ! the ratio of the deformation radius to the dominant

examples/coupled_AM2_LM3_SIS2/AM2_SIS2B_MOM6i_1deg/SIS_input

@@ -81,7 +81,7 @@ C_P = 3925.0                    !    C_P is the heat capacity of sea water in
                                 !  J kg-1 K-1, approximated as a constant.
 SNOW_ALBEDO = 0.88              !    The albedo of dry snow atop sea ice, ND.
 ICE_ALBEDO  = 0.68              !    The albedo of dry bare sea ice, ND.
-ICE_BULK_SALINITY = 0.005       !    The fixed bulk salinity of sea ice, in kg/kg.
+ICE_BULK_SALINITY = 5.0         !    The fixed bulk salinity of sea ice, in g/kg.
 
 !  Specify the properties of the surface forcing.
 ICE_OCEAN_STRESS_STAGGER = "B"  ! default = "B"