Code

Feature/update to gfdl 20210402#65

Code

Merged

jiandewang merged 49 commits intoNOAA-EMC:dev/emcNOAA-EMC/MOM6:dev/emcfrom jiandewang:feature/update-to-GFDL-20210402jiandewang/MOM6:feature/update-to-GFDL-20210402Copy head branch name to clipboardApr 12, 2021

+530-355

Commits

Commits on Dec 16, 2020

• Fixed bugs in CG_action, matrix_diagonal and calc_shelf_visc in

  Show description for f1041d1
  OlgaSergienko

  committed
  f1041d1

  Copy full SHA for f1041d1

• Modified MOM_ice_shelf_dynamics.F90

  OlgaSergienko

  committed
  39dd3e3

  Copy full SHA for 39dd3e3

Commits on Dec 23, 2020

• Matt's changes to drivers

  Show description for d27bcbd
  OlgaSergienko

  committed
  d27bcbd

  Copy full SHA for d27bcbd

Commits on Dec 29, 2020

• Modifications to register_diag_field in MOM_ice_shelf_dynamics to make ice-shelf_fields consistent

  Show description for ebac0ad
  OlgaSergienko

  committed
  ebac0ad

  Copy full SHA for ebac0ad

Commits on Feb 9, 2021

• corrected indecises in computation of driving stresses

  OlgaSergienko

  committed
  f30f636

  Copy full SHA for f30f636

Commits on Feb 10, 2021

• fixed ice-shelf advection

  OlgaSergienko

  committed
  7752052

  Copy full SHA for 7752052

Commits on Feb 11, 2021

• modified viscosity computations

  OlgaSergienko

  committed
  f0ae41c

  Copy full SHA for f0ae41c

Commits on Feb 18, 2021

• corrected initialize_boundary_channel call

  OlgaSergienko

  committed
  89f4386

  Copy full SHA for 89f4386

Commits on Feb 22, 2021

• corrected boundary mask in init_boundary_channel and updated u_ and

  Show description for 271bfce
  OlgaSergienko

  committed
  271bfce

  Copy full SHA for 271bfce

• dynamic ice shelf with non-linear viscosity and evolving ice thickness

  Show description for fdd83e6
  OlgaSergienko

  committed
  fdd83e6

  Copy full SHA for fdd83e6

Commits on Feb 24, 2021

• modified MOM_ice_shelf_initialize for testing with viscosity from a file

  OlgaSergienko

  committed
  32cfe35

  Copy full SHA for 32cfe35

Commits on Mar 2, 2021

• Update CVMix to v0.93-beta (no API change)

  Show description for 28b1ac9
  adcroft

  committed
  28b1ac9

  Copy full SHA for 28b1ac9

• Update CVMix to v0.94b-beta with API change

  Show description for 34dc0c8
  adcroft

  committed
  34dc0c8

  Copy full SHA for 34dc0c8

• Update CVMix to v0.98-beta

  Show description for e56d453
  adcroft

  committed
  e56d453

  Copy full SHA for e56d453

Commits on Mar 3, 2021

• Cleaned initialize_ice_shelf_boundary_channel

  OlgaSergienko

  committed
  5483bfe

  Copy full SHA for 5483bfe

• Modified MOM_ice_shelf_initialize.F90

  OlgaSergienko

  committed
  9aa75c8

  Copy full SHA for 9aa75c8

• corrected style errors in MOM_ice_shelf.F90; MOM_ice_shelf_dynamics.F90; MOM_ice_shelf_initialize.F90

  OlgaSergienko

  committed
  2232fa2

  Copy full SHA for 2232fa2

• More style errors

  OlgaSergienko

  committed
  aed4f0e

  Copy full SHA for aed4f0e

• Defined variables in ice_shelf_solve_outer

  OlgaSergienko

  committed
  43dadc1

  Copy full SHA for 43dadc1

Commits on Mar 6, 2021

• Bugfix: FGNV streamfunction vertical bounds

  Show description for 651b467
  marshallward

  committed
  651b467

  Copy full SHA for 651b467

Commits on Mar 9, 2021

• Bugfix: empty restart_input_dir for *_solo.res

  Show description for 54033aa
  herrwang0

  committed
  54033aa

  Copy full SHA for 54033aa

• Merge branch 'dev/gfdl' into fix-ocean_solo-res-dir

  herrwang0

  committed
  5b293ef

  Copy full SHA for 5b293ef

• Merge pull request mom-ocean#1348 from herrwang0/fix-ocean_solo-res-dir

  Show description for 1b05969
  marshallward

  authored
  1b05969

  Copy full SHA for 1b05969

• Merge branch 'main' into merge_from_main

  marshallward

  committed
  887c7af

  Copy full SHA for 887c7af

• Removed blocks of commented code. Added parentheses in calc_shelf_visc

  OlgaSergienko

  committed
  b47e493

  Copy full SHA for b47e493

• Merge pull request mom-ocean#1349 from marshallward/merge_from_main

  Show description for 56e9147
  adcroft

  authored
  56e9147

  Copy full SHA for 56e9147

• Explicitly set (1x1) io_domain as a default

  Show description for bb5eb25
  Hallberg-NOAA

  committed
  bb5eb25

  Copy full SHA for bb5eb25

Commits on Mar 10, 2021

• add parameter for allowing land mask changes

  Show description for 5b686c8
  DeniseWorthen

  committed
  5b686c8

  Copy full SHA for 5b686c8

• change logical from "topog_..." to "topo_..."

  DeniseWorthen

  committed
  8494ba8

  Copy full SHA for 8494ba8

Commits on Mar 11, 2021

• Removed blocks of commented text and multiplications by 0

  OlgaSergienko

  committed
  abc8fe4

  Copy full SHA for abc8fe4

• Merge pull request mom-ocean#1350 from Hallberg-NOAA/set_io_domain

  Show description for 250f007
  marshallward

  authored
  250f007

  Copy full SHA for 250f007

Commits on Mar 12, 2021

• Change units of slope returned from calc_isoneutral_slopes() to "Z L-1"

  Show description for 0d60fd0
  adcroft

  committed
  0d60fd0

  Copy full SHA for 0d60fd0

• Merge branch 'dev/gfdl' into cvmix-update

  marshallward

  authored
  b911a39

  Copy full SHA for b911a39

• Merge branch 'dev/gfdl' into ice_dynamics

  Hallberg-NOAA

  authored
  5839494

  Copy full SHA for 5839494

• Merge pull request mom-ocean#1344 from adcroft/cvmix-update

  Show description for 4255ada
  marshallward

  authored
  4255ada

  Copy full SHA for 4255ada

• Merge branch 'dev/gfdl' into units-for-slope

  marshallward

  authored
  ab241b6

  Copy full SHA for ab241b6

• Merge pull request mom-ocean#1351 from adcroft/units-for-slope

  Show description for a6f680c
  marshallward

  authored
  a6f680c

  Copy full SHA for a6f680c

• Merge branch 'dev/gfdl' into fgnv_bound_fix

  adcroft

  authored
  33d28f1

  Copy full SHA for 33d28f1

Commits on Mar 13, 2021

• Merge pull request mom-ocean#1346 from marshallward/fgnv_bound_fix

  Show description for 8dd9072
  adcroft

  authored
  8dd9072

  Copy full SHA for 8dd9072

Commits on Mar 14, 2021

• Merge branch 'dev/emc' into feature/allowmaskchanges

  DeniseWorthen

  committed
  b89152c

  Copy full SHA for b89152c

Commits on Mar 17, 2021

• Merge branch 'dev/gfdl' into ice_dynamics

  Hallberg-NOAA

  authored
  edc15f6

  Copy full SHA for edc15f6

Commits on Mar 18, 2021

• Merge pull request mom-ocean#1338 from OlgaSergienko/ice_dynamics

  Show description for 3193ab0
  Hallberg-NOAA

  authored
  3193ab0

  Copy full SHA for 3193ab0

Commits on Mar 23, 2021

• Testing: Recurse target submodules, LDFLAGS hook

  Show description for b33b3af
  marshallward

  committed
  b33b3af

  Copy full SHA for b33b3af

• Merge pull request mom-ocean#1355 from marshallward/test_submod_update

  Show description for 4fd897d
  adcroft

  authored
  4fd897d

  Copy full SHA for 4fd897d

• Merge branch 'dev/gfdl' into emc_update_20210322

  marshallward

  committed
  a1206ed

  Copy full SHA for a1206ed

• Style: Line length fix in MCT_cap

  marshallward

  committed
  8cc5018

  Copy full SHA for 8cc5018

Commits on Mar 25, 2021

• Merge pull request mom-ocean#1357 from marshallward/emc_update_20210322

  Show description for b92d763
  adcroft

  authored
  b92d763

  Copy full SHA for b92d763

Commits on Apr 1, 2021

• change default value of use_mommesh as true

  jiandewang

  committed
  b6c7fdb

  Copy full SHA for b6c7fdb

Commits on Apr 2, 2021

• Merge pull request mom-ocean#1358 from NOAA-GFDL/dev-gfdl-main-candidate-2021-03-26

  Show description for c549ae9
  marshallward

  authored
  c549ae9

  Copy full SHA for c549ae9