Skip to content

Commit

Permalink
MOM6: Merge pull request #1357 from marshallward/emc_update_20210322
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@b92d763ec Merge pull request #1357 from marshallward/emc_update_20210322
- NOAA-GFDL/MOM6@8cc501820 Style: Line length fix in MCT_cap
- NOAA-GFDL/MOM6@a1206ede8 Merge branch 'dev/gfdl' into emc_update_20210322
- NOAA-GFDL/MOM6@4fd897da2 Merge pull request #1355 from marshallward/test_submod_update
- NOAA-GFDL/MOM6@b33b3af7f Testing: Recurse target submodules, LDFLAGS hook
- NOAA-GFDL/MOM6@3193ab081 Merge pull request #1338 from OlgaSergienko/ice_dynamics
- NOAA-GFDL/MOM6@edc15f61c Merge branch 'dev/gfdl' into ice_dynamics
- NOAA-GFDL/MOM6@b89152c41 Merge branch 'dev/emc' into feature/allowmaskchanges
- NOAA-GFDL/MOM6@e5a40353f Merge pull request #61 from jiandewang/feature/update-to-GFDL-20210308
- NOAA-GFDL/MOM6@8dd907275 Merge pull request #1346 from marshallward/fgnv_bound_fix
- NOAA-GFDL/MOM6@33d28f138 Merge branch 'dev/gfdl' into fgnv_bound_fix
- NOAA-GFDL/MOM6@a6f680cc2 Merge pull request #1351 from adcroft/units-for-slope
- NOAA-GFDL/MOM6@ab241b642 Merge branch 'dev/gfdl' into units-for-slope
- NOAA-GFDL/MOM6@4255adad0 Merge pull request #1344 from adcroft/cvmix-update
- NOAA-GFDL/MOM6@5839494ce Merge branch 'dev/gfdl' into ice_dynamics
- NOAA-GFDL/MOM6@b911a3928 Merge branch 'dev/gfdl' into cvmix-update
- NOAA-GFDL/MOM6@0d60fd026 Change units of slope returned from calc_isoneutral_slopes() to "Z L-1"
- NOAA-GFDL/MOM6@250f00700 Merge pull request #1350 from Hallberg-NOAA/set_io_domain
- NOAA-GFDL/MOM6@abc8fe463 Removed blocks of commented text and multiplications by 0
- NOAA-GFDL/MOM6@8494ba8d6 change logical from "topog_..." to "topo_..."
- NOAA-GFDL/MOM6@5b686c838 add parameter for allowing land mask changes
- NOAA-GFDL/MOM6@bb5eb2527 Explicitly set (1x1) io_domain as a default
- NOAA-GFDL/MOM6@b47e493d3 Removed blocks of commented code. Added parentheses in calc_shelf_visc
- NOAA-GFDL/MOM6@3703ca7dd Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210308 this is corresponding to GFDL 20210308 main branch commit (hash # a4049e7)
- NOAA-GFDL/MOM6@a4049e784 Merge branch 'dev/gfdl' into main
- NOAA-GFDL/MOM6@651b4673f Bugfix: FGNV streamfunction vertical bounds
- NOAA-GFDL/MOM6@00cb11ce5 Merge pull request #56 from jiandewang/feature/update-to-GFDL-20210224
- NOAA-GFDL/MOM6@43dadc16a Defined variables in ice_shelf_solve_outer
- NOAA-GFDL/MOM6@aed4f0ee7 More style errors
- NOAA-GFDL/MOM6@2232fa288 corrected style errors in MOM_ice_shelf.F90; MOM_ice_shelf_dynamics.F90; MOM_ice_shelf_initialize.F90
- NOAA-GFDL/MOM6@9aa75c869 Modified MOM_ice_shelf_initialize.F90
- NOAA-GFDL/MOM6@5483bfed1 Cleaned initialize_ice_shelf_boundary_channel
- NOAA-GFDL/MOM6@e56d45335 Update CVMix to v0.98-beta
- NOAA-GFDL/MOM6@34dc0c848 Update CVMix to v0.94b-beta with API change
- NOAA-GFDL/MOM6@28b1ac922 Update CVMix to v0.93-beta (no API change)
- NOAA-GFDL/MOM6@a729a7fb4 Merge commit '00c2819457ab6d2497c871ce9a02d5e67e7f741c' into feature/update-to-GFDL-20210224 this is corresponding to GFDL 20210224 main branch commit (hash # 00c2819)
- NOAA-GFDL/MOM6@32cfe35a4 modified MOM_ice_shelf_initialize for testing with viscosity from a file
- NOAA-GFDL/MOM6@fdd83e658 dynamic ice shelf with non-linear viscosity and evolving ice thickness due to sub-ice-shelf melting
- NOAA-GFDL/MOM6@271bfce94 corrected boundary mask in init_boundary_channel and updated u_ and v_bdry_val through halo
- NOAA-GFDL/MOM6@89f4386eb corrected initialize_boundary_channel call
- NOAA-GFDL/MOM6@f0ae41c0c modified viscosity computations
- NOAA-GFDL/MOM6@cdc7690f4 Merge pull request #54 from DeniseWorthen/feature/optmesh
- NOAA-GFDL/MOM6@775205208 fixed ice-shelf advection
- NOAA-GFDL/MOM6@f30f636b2 corrected indecises in computation of driving stresses
- NOAA-GFDL/MOM6@a34ebb141 remove tempory bypass of mesh abort code
- NOAA-GFDL/MOM6@12b389520 Merge branch 'dev/emc' into feature/optmesh
- NOAA-GFDL/MOM6@13a5a2e0f comment out mask check which fails for mx100
- NOAA-GFDL/MOM6@7db2cc7a4 make mom mesh optional
- NOAA-GFDL/MOM6@d531a324a Merge pull request #51 from jiandewang/feature/update-to-GFDL-20210120
- NOAA-GFDL/MOM6@faeb13972 Merge pull request #1 from DeniseWorthen/bugfix/li2016fix
- NOAA-GFDL/MOM6@e7d0976de Fixes latent heat from fprec and frunoff
- NOAA-GFDL/MOM6@66ec49b2e Merge remote-tracking branch 'JiandeWang/feature/update-to-GFDL-20210120' into bugfix/li2016fix
- NOAA-GFDL/MOM6@e928fe22a Merge branch 'dev/emc' into bugfix/li2016fix
- NOAA-GFDL/MOM6@b544dad71 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@d63c2de85 Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210120 This is corresponding GFDL 20210120 main branch commit (hash # fe5e605)
- NOAA-GFDL/MOM6@cec1ad3b2 Merge pull request #49 from breichl/user/bgr/Tau_halo_updates_in_nupoc
- NOAA-GFDL/MOM6@91282c106 add brandon's halo update fix for LI_2016
- NOAA-GFDL/MOM6@29d768065 Add two halo updates for taux and tauy in mom_surface_forcing_nupoc - In A and B grid configuration halos were never updated after taux/tauy were populated. - This propogated through to the ustar_gustless field, hence caused a restart issue when using ustar_gustless in parameterizations. - This appears to correct the restart issue by updating the halos at the end of the A and B grid taux/tauy loops.
- NOAA-GFDL/MOM6@69b2a2354 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@ebac0adb8 Modifications to register_diag_field in MOM_ice_shelf_dynamics to make ice-shelf_fields consistent with diag_table Modifications to MOM_ice_shelf.F90 to apply melting to the case of a dynamic ice shelf.
- NOAA-GFDL/MOM6@d27bcbdba Matt's changes to drivers Merge branch 'revert_drivers' of https://github.com/MJHarrison-GFDL/MOM6 into matts-revert-drivers
- NOAA-GFDL/MOM6@39dd3e322 Modified MOM_ice_shelf_dynamics.F90
- NOAA-GFDL/MOM6@f1041d1f9 Fixed bugs in CG_action, matrix_diagonal and calc_shelf_visc in MOM_ice_shelf_dynamics.F90  modified initialize_ice_shelf_boundary_channel in MOM_ice_shelf_initialze.F90
- NOAA-GFDL/MOM6@a98f7db5e Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@f3bb72834 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@16ade2fe8 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@bfbd95aac white space changes
- NOAA-GFDL/MOM6@6164f63a9 manual add of dev/emc changes (statediagnose)
- NOAA-GFDL/MOM6@4e51baea1 Revert "Merge remote-tracking branch 'upstream/dev/emc' into dev/emc"
- NOAA-GFDL/MOM6@e4ca1dcb0 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@40bfb4bfe Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@6371e4892 Merge remote-tracking branch 'upstream/dev/emc' into dev/emc
- NOAA-GFDL/MOM6@58a69fcb6 Merge pull request #10 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@d53791175 Merge pull request #9 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@1be1217b2 Merge pull request #7 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@59270484c Merge pull request #6 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@fb02b3a4b Merge pull request #5 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@74f8d112c Merge pull request #4 from NOAA-EMC/dev/emc
- NOAA-GFDL/MOM6@2b7abecdc Merge pull request #2 from NOAA-EMC/dev/emc
  • Loading branch information
@marshallward
marshallward committed Mar 26, 2021
1 parent db44313 commit efb7a27
Show file tree
Hide file tree
Showing 33 changed files with 65 additions and 1 deletion.
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_fast_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_fast_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 608.4598627866924 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 608.4598627866924 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6500.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 9.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 621.958251953125 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6500.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 9.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 588.986572265625 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "All_edits.nc" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6500.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 9.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_025/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 9682.232421875 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6500.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 9.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM4_05/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 8799.6513671875 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "topo_edits_011818.nc" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6500.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 9.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/OM_1deg/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 8317.21875 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_bergs_cgrid/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/SIS2_cgrid/SIS_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
!MAXIMUM_DEPTH = 6000.0 ! [m]
! The (diagnosed) maximum depth of the ocean.
MINIMUM_DEPTH = 0.0 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/global_ALE/hycom/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/global_ALE/layer/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/global_ALE/z/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 2 additions & 0 deletions ocean_only/nonBous_global/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,8 @@ TOPO_VARNAME = "depth" ! default = "depth"
! The name of the bathymetry variable in TOPO_FILE.
TOPO_EDITS_FILE = "" ! default = ""
! The file from which to read a list of i,j,z topography overrides.
ALLOW_LANDMASK_CHANGES = False ! [Boolean] default = False
! If true, allow topography overrides to change land mask.
MAXIMUM_DEPTH = 6000.0 ! [m]
! The maximum depth of the ocean.
MINIMUM_DEPTH = 0.5 ! [m] default = 0.0
Expand Down
2 changes: 1 addition & 1 deletion src/MOM6
Submodule MOM6 updated 15 files
+6 −3 .testing/Makefile
+7 −6 config_src/drivers/mct_cap/mom_surface_forcing_mct.F90
+22 −1 config_src/drivers/nuopc_cap/mom_cap.F90
+8 −6 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+2 −2 config_src/infra/FMS1/MOM_diag_manager_infra.F90
+3 −1 config_src/infra/FMS1/MOM_domain_infra.F90
+1 −1 pkg/CVMix-src
+13 −13 src/core/MOM_isopycnal_slopes.F90
+11 −0 src/ice_shelf/MOM_ice_shelf.F90
+241 −131 src/ice_shelf/MOM_ice_shelf_dynamics.F90
+194 −169 src/ice_shelf/MOM_ice_shelf_initialize.F90
+12 −2 src/initialization/MOM_shared_initialization.F90
+6 −4 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+31 −23 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+0 −2 src/parameterizations/vertical/MOM_tidal_mixing.F90

0 comments on commit efb7a27

Please sign in to comment.