Code

Candidate branch main->dev/gfdl#120

Code

Merged

adcroft merged 67 commits intodev/gfdlNOAA-GFDL/MOM6:dev/gfdlfrom main_to_devNOAA-GFDL/MOM6:main_to_devCopy head branch name to clipboardMay 4, 2022

+74-12

Commits

Commits on May 5, 2020

• Merge pull request #1 from NOAA-EMC/dev/emc

  Show description for 671c714
  pjpegion

  authored
  671c714

  Copy full SHA for 671c714

• additions for stochastic physics and ePBL perts

  

  Philip Pegion

  authored and

  Philip Pegion

  committed
  182ef34

  Copy full SHA for 182ef34

• updates from dev/emc

  

  Philip Pegion

  authored and

  Philip Pegion

  committed
  c2aa2a8

  Copy full SHA for c2aa2a8

Commits on Oct 1, 2020

• Merge pull request #8 from NOAA-EMC/dev/emc

  Show description for 3cad1ba
  pjpegion

  authored
  3cad1ba

  Copy full SHA for 3cad1ba

• Merge branch 'ocn_stoch' into dev/emc_merge

  pjpegion

  authored
  0a62737

  Copy full SHA for 0a62737

• Merge pull request #9 from pjpegion/dev/emc_merge

  Show description for 9896d61
  pjpegion

  authored
  9896d61

  Copy full SHA for 9896d61

Commits on Dec 2, 2020

• Merge pull request #11 from NOAA-EMC/dev/emc

  Show description for cd06356
  pjpegion

  authored
  cd06356

  Copy full SHA for cd06356

• cleanup of code and enhancement of ePBL perts

  pjpegion

  committed
  7de295c

  Copy full SHA for 7de295c

• Update MOM_diabatic_driver.F90

  Show description for 7212400
  pjpegion

  authored
  7212400

  Copy full SHA for 7212400

• Update MOM_diabatic_driver.F90

  Show description for bd477a9
  pjpegion

  authored
  bd477a9

  Copy full SHA for bd477a9

• Merge pull request #12 from pjpegion/dev/emc

  Show description for 167a62e
  pjpegion

  authored
  167a62e

  Copy full SHA for 167a62e

• Update MOM_diabatic_driver.F90

  Show description for 0c15f4c
  pjpegion

  authored
  0c15f4c

  Copy full SHA for 0c15f4c

Commits on Dec 14, 2020

• add stochy_restart writing to mom_cap

  pjpegion

  committed
  a2a374b

  Copy full SHA for a2a374b

Commits on Dec 22, 2020

• additions for stochy restarts

  pjpegion

  committed
  25ed5ef

  Copy full SHA for 25ed5ef

Commits on Dec 23, 2020

• clean up debug statements

  pjpegion

  committed
  4bd9b9e

  Copy full SHA for 4bd9b9e

• Merge remote-tracking branch 'upstream/dev/emc' into dev/emc

  pjpegion

  committed
  1dc0f4f

  Copy full SHA for 1dc0f4f

• Merge branch 'dev/emc' into ocn_stoch

  pjpegion

  committed
  2cba995

  Copy full SHA for 2cba995

Commits on Jan 6, 2021

• Merge pull request #13 from NOAA-EMC/dev/emc

  Show description for 040e1f1
  pjpegion

  authored
  040e1f1

  Copy full SHA for 040e1f1

• clean up code

  pjpegion

  committed
  1d7ffa3

  Copy full SHA for 1d7ffa3

Commits on Jan 7, 2021

• fix non stochastic ePBL calculation

  pjpegion

  committed
  6bb9d0b

  Copy full SHA for 6bb9d0b

Commits on Jan 22, 2021

• Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch

  pjpegion

  committed
  600ebf9

  Copy full SHA for 600ebf9

Commits on Jan 29, 2021

• re-write of stochastic code to remove CPP directives

  pjpegion

  committed
  1727d9a

  Copy full SHA for 1727d9a

• remove blank link in MOM_diagnostics

  pjpegion

  committed
  5443f8e

  Copy full SHA for 5443f8e

• clean up MOM_domains

  pjpegion

  committed
  80f9f44

  Copy full SHA for 80f9f44

Commits on Feb 1, 2021

• Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch

  pjpegion

  committed
  85023f8

  Copy full SHA for 85023f8

Commits on Feb 2, 2021

• make stochastics optional

  pjpegion

  committed
  0b99c1f

  Copy full SHA for 0b99c1f

• correct coupled_driver/ocean_model_MOM.F90 and other cleanup

  pjpegion

  committed
  6e3ea1b

  Copy full SHA for 6e3ea1b

• clean up of code for MOM6 coding standards

  pjpegion

  committed
  eb88219

  Copy full SHA for eb88219

Commits on Feb 4, 2021

• remove stochastics container

  pjpegion

  committed
  d984a7e

  Copy full SHA for d984a7e

• place stochastic array in fluxes container and make SPPT specific arrays allocatable

  pjpegion

  committed
  b8d9888

  Copy full SHA for b8d9888

Commits on Feb 5, 2021

• revert MOM_domains.F90

  pjpegion

  committed
  25ed4fc

  Copy full SHA for 25ed4fc

• clean up of mom_ocean_model_nuopc.F90

  pjpegion

  committed
  8afe969

  Copy full SHA for 8afe969

• remove PE_here from mom_ocean_model_nuopc.F90

  pjpegion

  committed
  689a73f

  Copy full SHA for 689a73f

Commits on Feb 16, 2021

• Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch

  pjpegion

  committed
  a4c0411

  Copy full SHA for a4c0411

Commits on Feb 26, 2021

• remove debug statements

  pjpegion

  committed
  565e0bb

  Copy full SHA for 565e0bb

• Merge remote-tracking branch 'origin/dev/emc' into ocn_stoch

  pjpegion

  committed
  61717ee

  Copy full SHA for 61717ee

Commits on Jul 1, 2021

• update to dev/emc

  pjpegion

  committed
  202cbd4

  Copy full SHA for 202cbd4

Commits on Jul 26, 2021

• stochastic physics re-write

  pjpegion

  committed
  e4bc007

  Copy full SHA for e4bc007

• Merge remote-tracking branch 'upstream/dev/emc' into ocn_stoch_july2021

  pjpegion

  committed
  a3fa3a1

  Copy full SHA for a3fa3a1

• move stochastics to external directory

  pjpegion

  committed
  8bc4acc

  Copy full SHA for 8bc4acc

• doxygen cleanup

  pjpegion

  committed
  bdf2dc7

  Copy full SHA for bdf2dc7

• add write_stoch_restart_ocn to MOM_stochastics

  pjpegion

  committed
  c5f2b72

  Copy full SHA for c5f2b72

Commits on Jul 27, 2021

• add logic to remove incrments from restart if outside IAU window

  pjpegion

  committed
  5b2040e

  Copy full SHA for 5b2040e

Commits on Jul 28, 2021

• revert logic wrt increments

  pjpegion

  committed
  1b4273d

  Copy full SHA for 1b4273d

• add comments

  pjpegion

  committed
  237a510

  Copy full SHA for 237a510

• update to dev/emc

  pjpegion

  committed
  16e6af0

  Copy full SHA for 16e6af0

Commits on Aug 16, 2021

• update to gfdl 20210806 (#74)

  Show description for f8a8e4c
  

  3 peopleauthored
  f8a8e4c

  Copy full SHA for f8a8e4c

• Merge branch 'NOAA-EMC:dev/emc' into ocn_stoch_july2021

  pjpegion

  authored
  a8577df

  Copy full SHA for a8577df

Commits on Sep 14, 2021

• Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20210914

  Show description for 29016c2
  jiandewang

  committed
  29016c2

  Copy full SHA for 29016c2

Commits on Sep 21, 2021

• Merge pull request #76 from jiandewang/feature/update-to-GFDL-20210914

  Show description for 14ca4a1
  jiandewang

  authored
  14ca4a1

  Copy full SHA for 14ca4a1

• update to dev/emc

  pjpegion

  committed
  ca2ae1c

  Copy full SHA for ca2ae1c

• Merge branch 'ocn_stoch_july2021' of https://github.com/pjpegion/MOM6 into ocn_stoch_july2021

  pjpegion

  committed
  56bb41e

  Copy full SHA for 56bb41e

Commits on Sep 28, 2021

• return a more accurate error message in MOM_stochasics

  pjpegion

  committed
  a9a957e

  Copy full SHA for a9a957e

Commits on Sep 30, 2021

• Merge pull request #72 from pjpegion/ocn_stoch_july2021

  Show description for 36f17eb
  jiandewang

  authored
  36f17eb

  Copy full SHA for 36f17eb

Commits on Oct 20, 2021

• Merge remote-tracking branch 'GFDL/main' into feature/update-to-GFDL-20211019

  jiandewang

  committed
  fd02017

  Copy full SHA for fd02017

Commits on Oct 28, 2021

• Merge pull request #78 from jiandewang/feature/update-to-GFDL-20211019

  Show description for 90d5961
  jiandewang

  authored
  90d5961

  Copy full SHA for 90d5961

Commits on Dec 21, 2021

• solve minor conflict in mom_cap.F90 mom_ocean_model_nuopc.F90 and MOM_energetic_PBL.F90, add two new files: src/parameterizations/stochastic/MOM_stochastics.F90 and config_src/external/stochastic_p…

  Show description for e7c9ada
  jiandewang

  committed
  e7c9ada

  Copy full SHA for e7c9ada

• delete external/OCEAN_stochastic_phyiscs directory as Phil re-coded in external/stochastic_physics directory

  jiandewang

  committed
  9642b1d

  Copy full SHA for 9642b1d

Commits on Dec 29, 2021

• Merge pull request #81 from jiandewang/feature/update-to-main-20211220

  Show description for 32c0e1e
  jiandewang

  authored
  32c0e1e

  Copy full SHA for 32c0e1e

Commits on Feb 18, 2022

• Merge remote-tracking branch 'GFDL/main' into feature/update-to-main-20220217

  Show description for 966707f
  jiandewang

  committed
  966707f

  Copy full SHA for 966707f

Commits on Feb 24, 2022

• Merge pull request #85 from jiandewang/feature/update-to-main-20220217

  Show description for 44313d9
  jiandewang

  authored
  44313d9

  Copy full SHA for 44313d9

Commits on Mar 19, 2022

• Merge remote-tracking branch 'FSU/main' into feature/update-to-main-20220317

  Show description for ba37f94
  jiandewang

  committed
  ba37f94

  Copy full SHA for ba37f94

Commits on Mar 23, 2022

• Merge pull request #87 from jiandewang/feature/update-to-main-20220317

  Show description for 8ecf333
  jiandewang

  authored
  8ecf333

  Copy full SHA for 8ecf333

Commits on Mar 29, 2022

• An alternate fix to class(*) issues with FMS 2022-01

  Show description for d380f1d
  

  nikizadehgfdl

  authored and

  marshallward

  committed
  d380f1d

  Copy full SHA for d380f1d

Commits on Apr 4, 2022

• Merge pull request #88 from marshallward/missing_attrib_with_class_bugfix

  Show description for e532d86
  jiandewang

  authored
  e532d86

  Copy full SHA for e532d86

Commits on May 3, 2022

• Merge pull request mom-ocean#1566 from jiandewang/EMC-FMS-mixed-mode-20220411

  Show description for bac8031
  marshallward

  authored
  bac8031

  Copy full SHA for bac8031

• Candidate branch main->dev/gfdl

  Show description for 41a278b
  marshallward

  committed
  41a278b

  Copy full SHA for 41a278b