Code

Main to dev gfdl#1497

Code

Merged

Hallberg-NOAA merged 41 commits intomom-ocean:dev/gfdlmom-ocean/MOM6:dev/gfdlfrom marshallward:main_to_dev_gfdlmarshallward/MOM6:main_to_dev_gfdlCopy head branch name to clipboardSep 15, 2021

+1,280-229

Commits

Commits on Apr 22, 2021

• Merge pull request mom-ocean#186 from gustavo-marques/main-candidate-ncar-2021-04-21

  Show description for d3f4f0f
  alperaltuntas

  authored
  d3f4f0f

  Copy full SHA for d3f4f0f

Commits on Apr 26, 2021

• Merge pull request mom-ocean#187 from gustavo-marques/fix_retrieving_nthreads_nuopc

  Show description for 3812cf6
  gustavo-marques

  authored
  3812cf6

  Copy full SHA for 3812cf6

Commits on May 22, 2021

• Deallocate Kd_bkgnd and Kv_bkgnd

  Show description for 14e2334
  gustavo-marques

  committed
  14e2334

  Copy full SHA for 14e2334

Commits on May 23, 2021

• Merge pull request mom-ocean#188 from gustavo-marques/fix_mem_leak_bkgnd

  Show description for d1de7c8
  alperaltuntas

  authored
  d1de7c8

  Copy full SHA for d1de7c8

Commits on Jun 14, 2021

• introduce a new wave coupling method: VR12-MA (not fully implemented yet)

  alperaltuntas

  committed
  0d59156

  Copy full SHA for 0d59156

• Fixed a misplaced parentheses

  Show description for 276954f
  gustavo-marques

  committed
  276954f

  Copy full SHA for 276954f

• CFCs implementation via NUOPC cap

  Show description for 3aade32
  gustavo-marques

  committed
  3aade32

  Copy full SHA for 3aade32

Commits on Jun 15, 2021

• introduce the lamult import from ww3 in nuopc cap and add a diag

  alperaltuntas

  committed
  f45659d

  Copy full SHA for f45659d

Commits on Jul 1, 2021

• Merge pull request mom-ocean#189 from gustavo-marques/ncar_cfcs_implementation

  Show description for b7e0fda
  alperaltuntas

  authored
  b7e0fda

  Copy full SHA for b7e0fda

Commits on Jul 7, 2021

• import ifrac and u10_sqr only when CFC module is active

  alperaltuntas

  committed
  b767a13

  Copy full SHA for b767a13

Commits on Jul 8, 2021

• Merge pull request mom-ocean#190 from NCAR/fix_cfc_import

  Show description for 230a8b8
  gustavo-marques

  authored
  230a8b8

  Copy full SHA for 230a8b8

• merge latest dev/ncar into ww3_coupling_vr12ma

  alperaltuntas

  committed
  bc65e4f

  Copy full SHA for bc65e4f

Commits on Jul 9, 2021

• Enable the export of ice fraction when wave coupling is on.

  Show description for 5f756ab
  alperaltuntas

  committed
  5f756ab

  Copy full SHA for 5f756ab

• set lamult to 1 below ice

  alperaltuntas

  committed
  7d85ab2

  Copy full SHA for 7d85ab2

• move lamult from forces to fluxes

  alperaltuntas

  committed
  997636e

  Copy full SHA for 997636e

Commits on Jul 23, 2021

• Changes the order of calculation

  Show description for 7622911
  gustavo-marques

  committed
  7622911

  Copy full SHA for 7622911

Commits on Aug 2, 2021

• merge dev/ncar with main 210723

  alperaltuntas

  committed
  3117b98

  Copy full SHA for 3117b98

• Merge pull request mom-ocean#193 from NCAR/merge_main_210802

  Show description for 69f653a
  gustavo-marques

  authored
  69f653a

  Copy full SHA for 69f653a

Commits on Aug 3, 2021

• Merge pull request mom-ocean#191 from gustavo-marques/recover_answer_change_in_CFC_PR

  Show description for 3e1b0cd
  alperaltuntas

  authored
  3e1b0cd

  Copy full SHA for 3e1b0cd

Commits on Aug 5, 2021

• bringing in vr12ma ww3 coupling changes to the latest dev/ncar and resolving conflicts

  alperaltuntas

  committed
  7ebf3b0

  Copy full SHA for 7ebf3b0

• Minor fixes for the WW3 coupling option VR12-MA

  alperaltuntas

  committed
  1412771

  Copy full SHA for 1412771

• Introduce changes needed for CVMix KPP module for the VR12-MA wave coupling option

  alperaltuntas

  committed
  2d385a0

  Copy full SHA for 2d385a0

• fix doxygen error: add comments for wave method strings

  alperaltuntas

  committed
  9fe68ac

  Copy full SHA for 9fe68ac

• fix omp error in KPP module: add lamult to shared clauses

  alperaltuntas

  committed
  80e1e2e

  Copy full SHA for 80e1e2e

Commits on Aug 17, 2021

• change VR12-MA wave_method string to EFACTOR

  alperaltuntas

  committed
  734e537

  Copy full SHA for 734e537

• Refactor the way Langmuir entrainment and enhancement factor are computed and applied: (1) When available, pass the enhancement factor received from WW3. Otherwise, let CVmix compute the enhancemen…

  Show description for d734536
  alperaltuntas

  committed
  d734536

  Copy full SHA for d734536

Commits on Aug 23, 2021

• Various dimension rescaling fixes

  Show description for 9011801
  klindsay28

  committed
  9011801

  Copy full SHA for 9011801

• dimension rescaling fixes for MOM_CFC_cap tracers

  klindsay28

  committed
  e87adb8

  Copy full SHA for e87adb8

• let register_tracer handle flux_units for MOM_CFC_cap tracers

  klindsay28

  committed
  bc19819

  Copy full SHA for bc19819

• correct prepending inputdir to CFC_BC_file

  klindsay28

  committed
  fa96ae3

  Copy full SHA for fa96ae3

Commits on Aug 24, 2021

• Add run-time parameters CFC11_IC_VAL and CFC12_IC_VAL.

  klindsay28

  committed
  f6524ad

  Copy full SHA for f6524ad

• MOM_CFC_cap cleanup

  Show description for 197cd18
  klindsay28

  committed
  197cd18

  Copy full SHA for 197cd18

Commits on Aug 27, 2021

• Restore Vt2 diagnostic calculation when requested and retain the functionality of prescribed constant enhancement.

  alperaltuntas

  committed
  88b3642

  Copy full SHA for 88b3642

• Merge pull request mom-ocean#194 from NCAR/merge_ww3_coupling_vr12ma

  Show description for 380615d
  gustavo-marques

  authored
  380615d

  Copy full SHA for 380615d

• Merge pull request mom-ocean#195 from klindsay28/dimension_rescaling_fixes

  Show description for bdba2d2
  gustavo-marques

  authored
  bdba2d2

  Copy full SHA for bdba2d2

Commits on Aug 30, 2021

• Merge branch 'main' into dev-ncar-main-candidate-2021-08-30

  gustavo-marques

  committed
  91ab1e5

  Copy full SHA for 91ab1e5

Commits on Sep 2, 2021

• add references to KPP enhancements methods

  alperaltuntas

  committed
  11c550f

  Copy full SHA for 11c550f

• update all calls of KPP_compute_BLD and KPP_calculate to support the passage of lamult enhancement factor

  alperaltuntas

  committed
  5f8c446

  Copy full SHA for 5f8c446

• Merge pull request #7 from alperaltuntas/pr1491_fixes

  Show description for dc6f129
  gustavo-marques

  authored
  dc6f129

  Copy full SHA for dc6f129

Commits on Sep 14, 2021

• Merge pull request mom-ocean#1491 from gustavo-marques/dev-ncar-main-candidate-2021-08-30

  Show description for c09e199
  marshallward

  authored
  c09e199

  Copy full SHA for c09e199

• Merge branch 'dev/gfdl' into main_to_dev_gfdl

  marshallward

  committed
  72aabe5

  Copy full SHA for 72aabe5