Code

update to main branch 20220629 commit#95

Code

Merged

jiandewang merged 62 commits intoNOAA-EMC:dev/emcNOAA-EMC/MOM6:dev/emcfrom jiandewang:feature/update-to-main-20220603jiandewang/MOM6:feature/update-to-main-20220603Copy head branch name to clipboardJul 21, 2022

+2,294-914

Commits

Commits on May 21, 2021

• Adding Stokes forces implementation and diags.

  Show description for 77084ec
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  77084ec

  Copy full SHA for 77084ec

Commits on Jun 3, 2021

• Merge branch 'dev/gfdl' into Stokes_Forces

  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  0697b2d

  Copy full SHA for 0697b2d

Commits on Jun 4, 2021

• Finish incomplete merge in MOM_wave_interface.

  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  9fbdf11

  Copy full SHA for 9fbdf11

Commits on Jun 7, 2021

• Remote application of Stokes tendency on thermodynamic step

  Show description for a6de11c
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  a6de11c

  Copy full SHA for a6de11c

• Updating name of Stokes PGF routine to be more descriptive.

  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  c5f1d44

  Copy full SHA for c5f1d44

• Merge branch 'dev/gfdl' into Stokes_Forces

  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  51ab519

  Copy full SHA for 51ab519

Commits on Aug 25, 2021

• Merge remote-tracking branch 'breichl/Stokes_Forces' into pstokes_wave_cpl_mehtod

  alperaltuntas

  committed
  380a040

  Copy full SHA for 380a040

Commits on Aug 27, 2021

• Merge branch 'merge_ww3_coupling_vr12ma' into pstokes_wave_cpl_mehtod

  alperaltuntas

  committed
  0f0971a

  Copy full SHA for 0f0971a

Commits on Aug 30, 2021

• In NUOPC cap, add ability to import fields with ungridded dimensions

  alperaltuntas

  committed
  e3d190d

  Copy full SHA for e3d190d

Commits on Sep 7, 2021

• disable the register of tidal mixing coeff diags when they are unavailable

  alperaltuntas

  committed
  6e94b69

  Copy full SHA for 6e94b69

Commits on Sep 8, 2021

• Merge pull request mom-ocean#197 from NCAR/fix_tidal_coeff_diags

  Show description for f58053a
  gustavo-marques

  authored
  f58053a

  Copy full SHA for f58053a

Commits on Oct 6, 2021

• merge pr1507 with dev/ncar and resolve conflicts in MOM_tidal_mixing

  alperaltuntas

  committed
  dcf30ac

  Copy full SHA for dcf30ac

Commits on Oct 12, 2021

• remove unnecessary ampersands from variable declarations

  alperaltuntas

  committed
  59a31f6

  Copy full SHA for 59a31f6

Commits on Oct 15, 2021

• enclose stokes vorticity diag computations with Stokes_VF conditional

  alperaltuntas

  committed
  824039d

  Copy full SHA for 824039d

• enclose stokes vorticity diag computations with Stokes_VF conditional

  alperaltuntas

  committed
  b1c3412

  Copy full SHA for b1c3412

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

  alperaltuntas

  committed
  e089a8d

  Copy full SHA for e089a8d

• Do not call get_Langmuir_Number if lamult is already provided via ww3

  alperaltuntas

  committed
  a0d1d99

  Copy full SHA for a0d1d99

• fix doxygen errors in surfbands_refactor branch

  alperaltuntas

  committed
  eacd9d0

  Copy full SHA for eacd9d0

Commits on Oct 18, 2021

• Merge branch 'pr1507b' into merge_pr1507

  alperaltuntas

  committed
  cb5ae89

  Copy full SHA for cb5ae89

Commits on Oct 25, 2021

• Merge pull request mom-ocean#200 from NCAR/merge_pr1507

  Show description for 3d86e71
  gustavo-marques

  authored
  3d86e71

  Copy full SHA for 3d86e71

Commits on Oct 28, 2021

• changes in the nuopc cap to support arbitrary stokes bands

  Show description for 15c3d53
  alperaltuntas

  committed
  15c3d53

  Copy full SHA for 15c3d53

Commits on Dec 7, 2021

• refactoring and changes to write stokes drift

  Show description for e7f628e
  alperaltuntas

  committed
  e7f628e

  Copy full SHA for e7f628e

• Merge branch 'dev/ncar' into surfbands_refactor

  alperaltuntas

  committed
  6e929a7

  Copy full SHA for 6e929a7

• For the drivers calling MOM_wave_interface_init,

  Show description for c880a15
  alperaltuntas

  committed
  c880a15

  Copy full SHA for c880a15

Commits on Dec 8, 2021

• initialize wave option flags to false

  alperaltuntas

  committed
  e2ab77e

  Copy full SHA for e2ab77e

• Fix openmp test by adding Stokes_VT to shr clause

  Show description for d4c36a6
  alperaltuntas

  committed
  d4c36a6

  Copy full SHA for d4c36a6

Commits on Dec 10, 2021

• merge with latest dev/ncar and resolve conflicts

  alperaltuntas

  committed
  cb671d2

  Copy full SHA for cb671d2

Commits on Dec 14, 2021

• remove duplicate assignments of dvdx and dudy. These duplicate assignments incorrectly override dvdx and dudy when surfbands wave coupling is on.

  alperaltuntas

  committed
  b619d38

  Copy full SHA for b619d38

Commits on Dec 23, 2021

• Fixes for Stokes time tendency terms

  Show description for dc93bde
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  dc93bde

  Copy full SHA for dc93bde

• fixes in MOM_wave_interface array indices

  alperaltuntas

  committed
  28268d3

  Copy full SHA for 28268d3

• More changes for surfbands wave coupling:

  Show description for 4f592f2
  alperaltuntas

  committed
  4f592f2

  Copy full SHA for 4f592f2

Commits on Jan 14, 2022

• Updates to Stokes drift terms, primarily the pressure gradient routine.

  Show description for 58874a5
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  58874a5

  Copy full SHA for 58874a5

Commits on Jan 21, 2022

• Fixing diagnostic mode for vortex force correction term.

  Show description for f89fd13
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  f89fd13

  Copy full SHA for f89fd13

• Fixing restart issue with Stokes time tendency term.

  Show description for dc59b11
  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  dc59b11

  Copy full SHA for dc59b11

• Merge remote-tracking branch 'NCAR/surfbands_refactor' into BGR_Stokes_DDT_Fixes

  

  brandon.reichl

  authored and

  brandon.reichl

  committed
  a00b779

  Copy full SHA for a00b779

Commits on Feb 2, 2022

• fix line lenght error in MOM_wave_interface

  alperaltuntas

  committed
  c181854

  Copy full SHA for c181854

Commits on Feb 3, 2022

• Merge pull request mom-ocean#205 from NCAR/surfbands_refactor

  Show description for e55df40
  gustavo-marques

  authored
  e55df40

  Copy full SHA for e55df40

Commits on Feb 7, 2022

• Merge pull request mom-ocean#206 from mom-ocean/main

  Show description for d4b2eeb
  alperaltuntas

  authored
  d4b2eeb

  Copy full SHA for d4b2eeb

Commits on Feb 15, 2022

• Misc dimensional consistency fixes in regridding, remapping, and MEKE routines

  alperaltuntas

  authored
  035ae5c

  Copy full SHA for 035ae5c

Commits on Feb 18, 2022

• merge with latest main (2020feb17) and resolve conflicts

  alperaltuntas

  committed
  b39648a

  Copy full SHA for b39648a

• fix u10_sqr dimensional scaling

  alperaltuntas

  committed
  098f5c9

  Copy full SHA for 098f5c9

• Merge pull request mom-ocean#211 from NCAR/merge_main_feb17

  Show description for 8106f48
  gustavo-marques

  authored
  8106f48

  Copy full SHA for 8106f48

Commits on Mar 9, 2022

• Add KPP nonlocal term to passive tracers (mom-ocean#202)

  Show description for 6963b22
  mnlevy1981

  authored
  6963b22

  Copy full SHA for 6963b22

Commits on Apr 21, 2022

• Add option to receive enthalpy fluxes via coupler

  Show description for 72daf7b
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  72daf7b

  Copy full SHA for 72daf7b

• Heat conservation when enthalpy is via coupler

  Show description for b7665f4
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  b7665f4

  Copy full SHA for b7665f4

• Modify log/description of ENTHALPY_FROM_COUPLER

  Show description for 7924fba
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  7924fba

  Copy full SHA for 7924fba

• Modifications needed for when enthalpy is via CPL

  Show description for fc05abe
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  fc05abe

  Copy full SHA for fc05abe

• Changes needed for when enthalpy is via coupler

  Show description for b9b67a8
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  b9b67a8

  Copy full SHA for b9b67a8

• Add missing logical to control allocation of fluxes

  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  f814147

  Copy full SHA for f814147

• Avoid rotating arrays that are not associated

  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  fc3ab45

  Copy full SHA for fc3ab45

• Adds conditional for setting fluxes%heat_content_*

  Show description for 2cd228f
  

  gustavo-marques

  authored and

  alperaltuntas

  committed
  2cd228f

  Copy full SHA for 2cd228f

Commits on May 7, 2022

• Corrections to cell-averaged density computation (mom-ocean#213)

  Show description for 8f97b3d
  

  10 peopleauthored
  8f97b3d

  Copy full SHA for 8f97b3d

Commits on May 17, 2022

• Merge branch 'main_03may2022' into dev/ncar

  gustavo-marques

  committed
  359cc90

  Copy full SHA for 359cc90

Commits on May 19, 2022

• Merge pull request mom-ocean#216 from gustavo-marques/eval_main_03may2022

  Show description for b1eda27
  alperaltuntas

  authored
  b1eda27

  Copy full SHA for b1eda27

Commits on May 20, 2022

• Merge branch 'dev/ncar' into eval_main_candidate_16may2022

  gustavo-marques

  committed
  1d0604c

  Copy full SHA for 1d0604c

Commits on Jun 2, 2022

• Merge branch 'main' into eval_main_candidate_16may2022

  gustavo-marques

  committed
  e969261

  Copy full SHA for e969261

Commits on Jun 3, 2022

• Merge pull request mom-ocean#219 from gustavo-marques/eval_main_candidate_16may2022

  Show description for 9e27b52
  alperaltuntas

  authored
  9e27b52

  Copy full SHA for 9e27b52

Commits on Jun 9, 2022

• Add missing units

  Show description for 0c1e89a
  gustavo-marques

  committed
  0c1e89a

  Copy full SHA for 0c1e89a

• Follow MOM6 code style guide

  Show description for 3b80e44
  gustavo-marques

  committed
  3b80e44

  Copy full SHA for 3b80e44

Commits on Jun 29, 2022

• Merge pull request mom-ocean#1571 from gustavo-marques/dev-ncar-main-candidate-2022-06-03

  Show description for 4f6f975
  gustavo-marques

  authored
  4f6f975

  Copy full SHA for 4f6f975

• Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20220603

  jiandewang

  committed
  182b917

  Copy full SHA for 182b917

Commits on Jul 18, 2022

• add temperature limiter for SPPT in MOM_diabatic_driver

  jiandewang

  committed
  a249742

  Copy full SHA for a249742