Code

merge dev/emc into fork#1

Code

Merged

DeniseWorthen merged 73 commits intoDeniseWorthen:dev/emcDeniseWorthen/MOM6:dev/emcfrom NOAA-EMC:dev/emcNOAA-EMC/MOM6:dev/emcCopy head branch name to clipboardNov 16, 2019

+5,998-909

Commits

Commits on Aug 15, 2019

• Add time0 and timenow in MCT

  gustavo-marques

  committed
  52b018b

• Add time0 and timenow in NUOPC

  gustavo-marques

  committed
  bd57605

Commits on Aug 16, 2019

• Deletes unecessary if statement

  gustavo-marques

  committed
  4191689

• Deletes blank line contains spaces

  gustavo-marques

  committed
  52225e3

• Replaces timenow with time_start and corrects comments.

  gustavo-marques

  committed
  b61053b

Commits on Aug 19, 2019

• Merge pull request #116 from gustavo-marques/fix_ocean_stats

  Show description for b595da4
  alperaltuntas

  authored
  b595da4

Commits on Aug 20, 2019

• Obsolete parameter ADD_KV_SLOW

  gustavo-marques

  committed
  6e145df

• Removes visc%Kv_slow from restart files

  gustavo-marques

  committed
  9f2f709

Commits on Aug 21, 2019

• Merge pull request #117 from gustavo-marques/remove_kv_slow

  Show description for 5ff5a93
  alperaltuntas

  authored
  5ff5a93

Commits on Aug 22, 2019

• Fix first four loop indices suggested by Bob

  Show description for 93727f8
  gustavo-marques

  committed
  93727f8

Commits on Aug 23, 2019

• Deletes max_diss_rate_bt since it is never used

  gustavo-marques

  committed
  e778191

• Fixes the remaining loop indices related to GME

  gustavo-marques

  committed
  3b7cb69

• Removes unneeded calls to pass_var and add calls to pass_vector

  gustavo-marques

  committed
  3257801

• Groups terms for rotational invariance and deletes beta_h and beta_q (unused)

  gustavo-marques

  committed
  b339108

Commits on Aug 26, 2019

• Adds correct calculation of GME at q points

  gustavo-marques

  committed
  0aeec9d

• Created new variables dvdx3/dudy3 for shearing strain on the Laplacian

  gustavo-marques

  committed
  fa773cd

• Deleting comments

  gustavo-marques

  committed
  2ac12ce

Commits on Aug 27, 2019

• Adds consistency check between mesh and mom6 grid

  Show description for d29a435
  gustavo-marques

  committed
  d29a435

• Replaces CICE to MOM in error messages

  gustavo-marques

  committed
  fb1133e

Commits on Aug 28, 2019

• Merge pull request #118 from gustavo-marques/consistency_check_nuopc

  Show description for d6277ca
  alperaltuntas

  authored
  d6277ca

• remove labeled format specifiers

  alperaltuntas

  committed
  7ad7296

• Adds new parameter, MEKE_EQUILIBRIUM_ALT

  Show description for cc9e33d
  gustavo-marques

  committed
  cc9e33d

• Final GME code fix

  Show description for d05235f
  gustavo-marques

  committed
  d05235f

• replace hard-coded mesh diff. limit with a param: eps_omesh

  alperaltuntas

  committed
  18c6f1e

• add units to EPS_OMESH

  alperaltuntas

  committed
  66f808b

• call get_eps_omesh and remove hardcoded limit

  alperaltuntas

  committed
  c698b1a

• call MOM_error if mesh is inconsistent

  alperaltuntas

  committed
  d9a00d7

Commits on Aug 29, 2019

• compare mod 360 of diff and eps

  alperaltuntas

  committed
  e02b358

• Add EPS_OMESH value in error message

  alperaltuntas

  committed
  7f7e8c0

• Merge pull request #119 from NCAR/improve_consistency_check

  Show description for d329136
  gustavo-marques

  authored
  d329136

• Fixes line length exceeded

  gustavo-marques

  committed
  b810e26

• Merge pull request #120 from gustavo-marques/fix_gme

  Show description for 38be24e
  alperaltuntas

  authored
  38be24e

Commits on Aug 30, 2019

• Merge branch 'dev/ncar' into merge-dev-master-candidate-2019-08-30

  gustavo-marques

  committed
  cfe0e70

Commits on Sep 3, 2019

• Commented out variables left over from merge

  Show description for 15a03c5
  gustavo-marques

  committed
  15a03c5

• Adds OS%US as argument in add_shelf_forces

  gustavo-marques

  committed
  ab9bc8a

• Adding back 2018_answers and cleanning the code

  gustavo-marques

  committed
  25b409b

Commits on Sep 12, 2019

• Fixes a bug when computing PE_release_h

  Show description for fe44289
  gustavo-marques

  committed
  fe44289

Commits on Sep 13, 2019

• Deletes whitespace

  gustavo-marques

  committed
  584177f

• Deletes more whitespace

  gustavo-marques

  committed
  466903b

• Merge pull request #121 from gustavo-marques/fix_MEKE_GM_src

  Show description for 69ee7bc
  alperaltuntas

  authored
  69ee7bc

Commits on Sep 16, 2019

• Merge branch 'dev/ncar' into merge-dev-master-candidate-2019-08-30

  gustavo-marques

  committed
  4d0e180

• Removes white space

  gustavo-marques

  committed
  1852356

• Merge pull request #5 from NCAR/dev/ncar

  Show description for fda9848
  alperaltuntas

  authored
  fda9848

Commits on Sep 17, 2019

• Removed diagnostics related to FrictWork_diss and FrictWork_Max

  Show description for ba2f186
  gustavo-marques

  committed
  ba2f186

• Avoids posting Kv_slow when it is not initialized

  gustavo-marques

  committed
  992e826

• Merge pull request #122 from gustavo-marques/merge-dev-master-candidate-2019-08-30

  Show description for 6eeeea5
  alperaltuntas

  authored
  6eeeea5

• remove unused modules

  alperaltuntas

  committed
  353cea1

• add ncar version of Doxyfile

  alperaltuntas

  committed
  c295ce1

• use Doxyfile_ncar_rtd if env var NCAR_FORK defined

  alperaltuntas

  committed
  46d4385

• Merge pull request #123 from alperaltuntas/create_ncar_fork_of_doxygen

  Show description for 3513c68
  alperaltuntas

  authored
  3513c68

• rm empty line

  alperaltuntas

  committed
  e18a5b4

• Merge pull request #6 from alperaltuntas/create_ncar_fork_of_doxygen

  Show description for ed59be3
  alperaltuntas

  authored
  ed59be3

• changes for API page generation

  alperaltuntas

  committed
  e44474c

• designate /mom_cap.F90 doxygen as subpage

  alperaltuntas

  committed
  0b7f600

• move ncar files to ncar/ dir

  alperaltuntas

  committed
  26c376c

• set EXTRACT_ALL to generate call graphs

  alperaltuntas

  committed
  521c732

• Merge pull request #124 from alperaltuntas/create_ncar_fork_of_doxygen

  Show description for 2bd130f
  alperaltuntas

  authored
  2bd130f

Commits on Sep 18, 2019

• Fix the NUOPC cap doxygen to use HTML style formatting for the import/export field tables

  rsdunlapiv

  committed
  7dc0fd0

Commits on Sep 19, 2019

• Move doxygen to end of module to be consistent with MOM6 conventions

  rsdunlapiv

  committed
  d1b0322

• Merge pull request #125 from NCAR/rsdunlapiv/cap_doc_fix

  Show description for d8a3886
  alperaltuntas

  authored
  d8a3886

• Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen

  alperaltuntas

  committed
  0369959

• Merge branch 'dev/ncar' of https://github.com/NCAR/MOM6 into dev/ncar

  alperaltuntas

  committed
  3260a30

• Merge branch 'dev/ncar' into create_ncar_fork_of_doxygen

  alperaltuntas

  committed
  51a179a

• fix subroutine table

  alperaltuntas

  committed
  900ad92

• fix import/export field tables

  alperaltuntas

  committed
  de0777d

• correct runoff units

  alperaltuntas

  committed
  8648351

Commits on Sep 20, 2019

• Merge pull request #126 from alperaltuntas/create_ncar_fork_of_doxygen

  Show description for 3b957a7
  alperaltuntas

  authored
  3b957a7

Commits on Oct 2, 2019

• Merge branch 'dev/master' into dev-master-candidate-ncar-2019-10-02

  gustavo-marques

  committed
  be86d57

Commits on Oct 4, 2019

• Restored comments documenting the dimensional rescaling of variables

  gustavo-marques

  committed
  bccdf19

Commits on Nov 7, 2019

• Merge pull request mom-ocean#1013 from gustavo-marques/dev-master-candidate-ncar-2019-10-02

  Show description for ec31391
  marshallward

  authored
  ec31391

• Merge remote-tracking branch 'GFDL/dev/master' into testnewdevmaster20191107

  Show description for 100e92d
  JessicaMeixner-NOAA

  committed
  100e92d

Commits on Nov 8, 2019

• updating mom_cap to add data override which was deleted in merge

  JessicaMeixner-NOAA

  committed
  07481e4

Commits on Nov 13, 2019

• Merge NOAA-GFDL dev/master from 20191107

  JessicaMeixner-NOAA

  authored
  9a6f7f6