Code

Merging dev/master#8

Code

Closed

gustavo-marques wants to merge 104 commits intoNCAR:dev/ncarNCAR/MOM6:dev/ncarfrom gustavo-marques:merge_dev/mastergustavo-marques/MOM6:merge_dev/masterCopy head branch name to clipboard

+8,721-5,322

Commits

Commits on May 9, 2017

• Clean up some changes that were made for development purposes

  

  Andrew Shao

  committed
  d2af9df

  Copy full SHA for d2af9df

Commits on May 10, 2017

• Changes made so that regridding onto pure isopycnal kind of works. Need to

  Show description for f4e0063
  

  Andrew Shao

  committed
  f4e0063

  Copy full SHA for f4e0063

Commits on May 17, 2017

• Add option to skip convective readjustment when reading offline fields

  Show description for ab0575d
  

  Andrew Shao

  committed
  ab0575d

  Copy full SHA for ab0575d

Commits on Jun 1, 2017

• To aid in the debugging of tracer routines, a new subroutine is created

  Show description for ff690d1
  

  Andrew Shao

  committed
  ff690d1

  Copy full SHA for ff690d1

• Tracer now conserves when remapping input fields onto a different grid.

  Show description for af73ea8
  

  Andrew Shao

  committed
  af73ea8

  Copy full SHA for af73ea8

Commits on Jun 2, 2017

• Added option to intersperse ALE step between horizontal advection

  Show description for 7ddc722
  

  Andrew Shao

  committed
  7ddc722

  Copy full SHA for 7ddc722

Commits on Jun 8, 2017

• Fixed conflicts with upstream dev/gfdl

  

  Andrew Shao

  committed
  53d03a7

  Copy full SHA for 53d03a7

Commits on Jun 9, 2017

• Added modified Leith viscosity.

  Show description for 48fe2c7
  sdbachman

  committed
  48fe2c7

  Copy full SHA for 48fe2c7

Commits on Jun 13, 2017

• (*)Moved set_viscous_BBL out of the dynamics code

  Show description for 0576b2b
  Hallberg-NOAA

  committed
  0576b2b

  Copy full SHA for 0576b2b

• +Eliminated calc_bbl from the vertvisc_type

  Show description for e1aed13
  Hallberg-NOAA

  committed
  e1aed13

  Copy full SHA for e1aed13

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  144daae

  Copy full SHA for 144daae

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  b80fc8b

  Copy full SHA for b80fc8b

• Merge pull request mom-ocean#519 from Hallberg-NOAA/dev/gfdl

  Show description for 2b8670f
  adcroft

  authored
  2b8670f

  Copy full SHA for 2b8670f

Commits on Jun 14, 2017

• Bugfix to reintroduce group halo pass check removed in 282a160

  Show description for 833dd84
  wfcooke

  committed
  833dd84

  Copy full SHA for 833dd84

• (*)Corrected the barotropic mass source compensation

  Show description for db3a5b5
  Hallberg-NOAA

  committed
  db3a5b5

  Copy full SHA for db3a5b5

• +BT_OBC%H_u fix.

  kshedstrom

  committed
  ab9e05e

  Copy full SHA for ab9e05e

• Merge pull request mom-ocean#520 from NOAA-GFDL/user/wfcooke/grouphalopass_fix

  Show description for 1e8c2b4
  wfcooke

  authored
  1e8c2b4

  Copy full SHA for 1e8c2b4

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  e8b7f0e

  Copy full SHA for e8b7f0e

• Corrected typos in dOxyGen comments

  Show description for 5daf60f
  Hallberg-NOAA

  committed
  5daf60f

  Copy full SHA for 5daf60f

• Replaced group_pass of h with pass_var of h

  Show description for a8565c7
  Hallberg-NOAA

  committed
  a8565c7

  Copy full SHA for a8565c7

Commits on Jun 15, 2017

• added Doxygen comments to MOM_checksum_packages.F90

  Show description for e22cdeb
  CarolineCardinale

  committed
  e22cdeb

  Copy full SHA for e22cdeb

• Merge pull request mom-ocean#521 from Hallberg-NOAA/dev/gfdl

  Show description for d20e897
  adcroft

  authored
  d20e897

  Copy full SHA for d20e897

• Merge remote-tracking branch 'refs/remotes/origin/dev/gfdl' into dev/gfdl

  CarolineCardinale

  committed
  76a8484

  Copy full SHA for 76a8484

• added Doxygen comments to MOM_checksum_packages.F90

  Show description for 73380f5
  CarolineCardinale

  committed
  73380f5

  Copy full SHA for 73380f5

• Added Doxygen comments to MOM_dynamics_legacy_split.F90

  Show description for a06258f
  CarolineCardinale

  committed
  a06258f

  Copy full SHA for a06258f

• Added Doxygen comments to MOM_dynamics_unsplit.F90

  Show description for e216c50
  CarolineCardinale

  committed
  e216c50

  Copy full SHA for e216c50

Commits on Jun 16, 2017

• Added doxygen comments to MOM_dynamics_unsplit_RK2.F90

  Show description for 22827d0
  CarolineCardinale

  committed
  22827d0

  Copy full SHA for 22827d0

• Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into offline_tracer_updates

  Show description for d8627bc
  

  Andrew Shao

  committed
  d8627bc

  Copy full SHA for d8627bc

• Undo some changes made for diagnostic purposes, add comments, and cleanup

  Show description for ce44698
  

  Andrew Shao

  committed
  ce44698

  Copy full SHA for ce44698

• Added doxygen comments to MOM_interface_heights.F90

  Show description for ced9786
  CarolineCardinale

  committed
  ced9786

  Copy full SHA for ced9786

• Added doxygen comments to MOM_verticalGrid.F90

  Show description for 869be3c
  CarolineCardinale

  committed
  869be3c

  Copy full SHA for 869be3c

• Final changes before PR

  

  Andrew Shao

  committed
  d96c87b

  Copy full SHA for d96c87b

Commits on Jun 17, 2017

• Found another BT_cont issue with silly values.

  kshedstrom

  committed
  9aa2110

  Copy full SHA for 9aa2110

Commits on Jun 19, 2017

• Added Doxygen comments to MOM_checksum_packages.F90

  Show description for c929a77
  CarolineCardinale

  committed
  c929a77

  Copy full SHA for c929a77

• Added Doxygen comments to MOM_dynamics_legacy_split.F90

  Show description for 8abf4af
  CarolineCardinale

  committed
  8abf4af

  Copy full SHA for 8abf4af

• Added doxygen comments to MOM_verticalGrid.F90

  Show description for a74868f
  CarolineCardinale

  committed
  a74868f

  Copy full SHA for a74868f

• Merge branch 'ashao-offline_tracer_updates' into dev/gfdl

  adcroft

  committed
  3486d83

  Copy full SHA for 3486d83

• Merge pull request mom-ocean#524 from CarolineCardinale/dev/gfdl

  Show description for bb5a9cc
  adcroft

  authored
  bb5a9cc

  Copy full SHA for bb5a9cc

• Added doxygen comments to MOM_legacy_barotropic.F90

  Show description for 64b35c3
  CarolineCardinale

  committed
  64b35c3

  Copy full SHA for 64b35c3

• +Permit Gregorian calendar with MOM6 solo driver

  Show description for fcca0b8
  Hallberg-NOAA

  committed
  fcca0b8

  Copy full SHA for fcca0b8

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  56316f3

  Copy full SHA for 56316f3

• Added doxygen comments to MOM_OCMIP_CFC.F90

  Show description for 5c49c2d
  CarolineCardinale

  committed
  5c49c2d

  Copy full SHA for 5c49c2d

• Corrected two openMP directives

  Show description for 5c9706f
  Hallberg-NOAA

  committed
  5c9706f

  Copy full SHA for 5c9706f

Commits on Jun 20, 2017

• * Corrected diurnal tide _struct

  Show description for 4274481
  awallcraft

  committed
  4274481

  Copy full SHA for 4274481

• +Another silly_value find, in Coriolis.

  kshedstrom

  committed
  1d44eec

  Copy full SHA for 1d44eec

• Merge pull request mom-ocean#525 from Hallberg-NOAA/dev/gfdl

  Show description for 9ccbe6f
  adcroft

  authored
  9ccbe6f

  Copy full SHA for 9ccbe6f

• Merge remote-tracking branch 'gfdl/dev/gfdl' into user/ksh/open_bc

  kshedstrom

  committed
  a64f5ba

  Copy full SHA for a64f5ba

• Merge pull request mom-ocean#526 from awallcraft/dev/gfdl

  Show description for f348179
  adcroft

  authored
  f348179

  Copy full SHA for f348179

Commits on Jun 21, 2017

• Changed intent for G in tidal_forcing_init()

  Show description for 379c6b0
  adcroft

  committed
  379c6b0

  Copy full SHA for 379c6b0

• Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev/gfdl

  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  9aa01c9

  Copy full SHA for 9aa01c9

• Added doxygen comments to MOM_domains.F90

  Show description for 0356c63
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  0356c63

  Copy full SHA for 0356c63

• Added doxygen comments to MOM_diag_to_Z.F90

  Show description for e9b0a48
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  e9b0a48

  Copy full SHA for e9b0a48

• Added doxygen comments to MOM_diagnostics.F90

  Show description for 3fdcb86
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  3fdcb86

  Copy full SHA for 3fdcb86

• Added doxygen comments to MOM_PointAccel.F90

  Show description for c8cdb04
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  c8cdb04

  Copy full SHA for c8cdb04

• Added doxygen comments to MOM_sum_output.F90

  Show description for 154877e
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  154877e

  Copy full SHA for 154877e

• Added doxygen comments to MOM_wave_structure.F90

  Show description for 26ed48b
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  26ed48b

  Copy full SHA for 26ed48b

• Merge pull request mom-ocean#528 from adcroft/fix-domain-intent-tidal-forcing-for-passvar

  Show description for e09f0a9
  Hallberg-NOAA

  authored
  e09f0a9

  Copy full SHA for e09f0a9

Commits on Jun 22, 2017

• Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev/gfdl

  CarolineCardinale

  committed
  0d5399f

  Copy full SHA for 0d5399f

• Added doxygen comments to subroutines

  Show description for 86972b5
  CarolineCardinale

  committed
  86972b5

  Copy full SHA for 86972b5

• +Added the ability to read a time type as a date

  Show description for d9afca3
  Hallberg-NOAA

  committed
  d9afca3

  Copy full SHA for d9afca3

• Eliminated trailing white space

  Show description for 3f7def7
  Hallberg-NOAA

  committed
  3f7def7

  Copy full SHA for 3f7def7

• Merge pull request mom-ocean#529 from Hallberg-NOAA/dev/gfdl

  Show description for db9ae76
  adcroft

  authored
  db9ae76

  Copy full SHA for db9ae76

• Added doxumentation for the Fox-Kemper scheme

  Show description for 0b961d1
  adcroft

  committed
  0b961d1

  Copy full SHA for 0b961d1

Commits on Jun 23, 2017

• Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev/gfdl

  CarolineCardinale

  committed
  d2e6771

  Copy full SHA for d2e6771

• Initialized CS%Modified_Leith.

  Show description for 54b51b3
  sdbachman

  committed
  54b51b3

  Copy full SHA for 54b51b3

• Added Doxygen comments to subroutines

  Show description for 40a7aed
  CarolineCardinale

  committed
  40a7aed

  Copy full SHA for 40a7aed

• Merge pull request mom-ocean#515 from septicscuzzy/add_Leith

  Show description for 127e8dd
  adcroft

  authored
  127e8dd

  Copy full SHA for 127e8dd

• Merge branch 'dev/gfdl' of https://github.com/NOAA-GFDL/MOM6 into dev/gfdl

  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  b616fbd

  Copy full SHA for b616fbd

• Added Doxygen comments to subroutines

  Show description for 86786a5
  

  Caroline Cardinale

  authored and

  Caroline Cardinale

  committed
  86786a5

  Copy full SHA for 86786a5

• Merge branch 'user/ksh/open_bc' of https://github.com/ESMG/MOM6 into ESMG-user/ksh/open_bc

  Hallberg-NOAA

  committed
  f4da414

  Copy full SHA for f4da414

• Merge branch 'ESMG-user/ksh/open_bc' into dev/gfdl

  Hallberg-NOAA

  committed
  f9087c5

  Copy full SHA for f9087c5

• Merge pull request mom-ocean#530 from adcroft/document-fox-kemper

  Show description for 2cccc6a
  Hallberg-NOAA

  authored
  2cccc6a

  Copy full SHA for 2cccc6a

• Merge pull request mom-ocean#533 from CarolineCardinale/dev/gfdl

  Show description for 8d8ad81
  Hallberg-NOAA

  authored
  8d8ad81

  Copy full SHA for 8d8ad81

Commits on Jun 27, 2017

• Corrects schematic of symmetric arrays

  Show description for 97c8f81
  adcroft

  committed
  97c8f81

  Copy full SHA for 97c8f81

Commits on Jun 28, 2017

• Merge pull request mom-ocean#534 from adcroft/correct-horizontal-indexing-schematics

  Show description for 0c4f909
  Hallberg-NOAA

  authored
  0c4f909

  Copy full SHA for 0c4f909

• Fixes openmp directives for Leith mods

  Show description for d69ca55
  adcroft

  committed
  d69ca55

  Copy full SHA for d69ca55

• Renames "mod" variable to avoid using imod() fn

  Show description for 76bd4d4
  adcroft

  committed
  76bd4d4

  Copy full SHA for 76bd4d4

Commits on Jun 29, 2017

• Merge pull request mom-ocean#535 from adcroft/fix-hor-visc-openmp

  Show description for 9c3ff33
  Hallberg-NOAA

  authored
  9c3ff33

  Copy full SHA for 9c3ff33

• +Always call initialization routines to get_params

  Show description for e6b7df2
  Hallberg-NOAA

  committed
  e6b7df2

  Copy full SHA for e6b7df2

• +Made OS argument to ocean_model_flux_init optional

  Show description for 530fea2
  Hallberg-NOAA

  committed
  530fea2

  Copy full SHA for 530fea2

• Removed trailing white space

  Show description for 5f0fec7
  Hallberg-NOAA

  committed
  5f0fec7

  Copy full SHA for 5f0fec7

• Merge pull request mom-ocean#536 from adcroft/fix-gnu-openmp-490

  Show description for 83f606a
  Hallberg-NOAA

  authored
  83f606a

  Copy full SHA for 83f606a

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  ebbce13

  Copy full SHA for ebbce13

• Merge branch 'dev/gfdl' of https://github.com/Hallberg-NOAA/MOM6 into Hallberg-NOAA-dev/gfdl

  adcroft

  committed
  74bcc77

  Copy full SHA for 74bcc77

• Merge branch 'Hallberg-NOAA-dev/gfdl' into dev/gfdl

  adcroft

  committed
  249e9f6

  Copy full SHA for 249e9f6

• Merge branch 'dev/gfdl' of github.com:NOAA-GFDL/MOM6 into dev/gfdl

  Hallberg-NOAA

  committed
  f6bade7

  Copy full SHA for f6bade7

• Renamed variables "mod" to "mdl"

  Show description for fec16b9
  Hallberg-NOAA

  committed
  fec16b9

  Copy full SHA for fec16b9

Commits on Jun 30, 2017

• Merge pull request mom-ocean#538 from Hallberg-NOAA/dev/gfdl

  Show description for a1ac57f
  adcroft

  authored
  a1ac57f

  Copy full SHA for a1ac57f

Commits on Jul 1, 2017

• Re-factor of MOM_lateral_mixing_coeffs.F90 (VarMix)

  Show description for 3e50273
  adcroft

  committed
  3e50273

  Copy full SHA for 3e50273

• Fix VarMix cleanup with openMP

  adcroft

  committed
  a110df9

  Copy full SHA for a110df9

Commits on Jul 2, 2017

• Implemented scale-aware option for MLE

  Show description for f733ff0
  adcroft

  committed
  f733ff0

  Copy full SHA for f733ff0

• Fixed argument name to match declaration gen_trcr_col_physics()

  Show description for 6e4eaa4
  adcroft

  committed
  6e4eaa4

  Copy full SHA for 6e4eaa4

• Replaced "sum" with "res" for variable name

  Show description for 3eecc26
  adcroft

  committed
  3eecc26

  Copy full SHA for 3eecc26

• Replaced array-syntax with loops

  Show description for 0f28767
  adcroft

  committed
  0f28767

  Copy full SHA for 0f28767

• Avoid allocating unused arrays in diabatic_driver

  Show description for 04116e8
  adcroft

  committed
  04116e8

  Copy full SHA for 04116e8

• Added "skip_diags" argument to extractFluxes1d()

  Show description for b56e593
  adcroft

  committed
  b56e593

  Copy full SHA for b56e593

Commits on Jul 5, 2017

• Merge pull request mom-ocean#539 from adcroft/cleanup-varmix

  Show description for 7d401bc
  Hallberg-NOAA

  authored
  7d401bc

  Copy full SHA for 7d401bc

• Merge pull request mom-ocean#540 from adcroft/mle-length-scale

  Show description for 13541f4
  Hallberg-NOAA

  authored
  13541f4

  Copy full SHA for 13541f4

• Merge pull request mom-ocean#541 from adcroft/fix-generic-tracer-MLD-arg

  Show description for e05d8ae
  Hallberg-NOAA

  authored
  e05d8ae

  Copy full SHA for e05d8ae

• Merge pull request mom-ocean#542 from adcroft/replace-keyword-variable-name

  Show description for e9f146d
  Hallberg-NOAA

  authored
  e9f146d

  Copy full SHA for e9f146d

• Merge pull request mom-ocean#544 from adcroft/fix-hdfs-diagnostic

  Show description for 0192c3c
  Hallberg-NOAA

  authored
  0192c3c

  Copy full SHA for 0192c3c

• Fix openMP directive in MOM_forcing_type.F90

  Show description for 6db42af
  adcroft

  committed
  6db42af

  Copy full SHA for 6db42af

Commits on Jul 21, 2017

• Merge branch 'dev/master' into dev/ncar

  gustavo-marques

  committed
  b2e405a

  Copy full SHA for b2e405a

• Replaces mod to mdl

  gustavo-marques

  committed
  87882c8

  Copy full SHA for 87882c8