Code

Merge latest main (05d8cc3)#322

Code

Merged

alperaltuntas merged 39 commits intoNCAR:dev/ncarNCAR/MOM6:dev/ncarfrom alperaltuntas:merge_mainalperaltuntas/MOM6:merge_mainCopy head branch name to clipboardNov 7, 2024

+852-834

Commits

Commits on Jul 8, 2024

• initialize cpl_scalar field when created

  DeniseWorthen

  committed
  8d05f39

  Copy full SHA for 8d05f39

Commits on Jul 29, 2024

• (*)Parenthesize squares of wind stresses for FMAs

  Show description for 6628dbf
  Hallberg-NOAA

  committed
  6628dbf

  Copy full SHA for 6628dbf

• (*)Parenthesize continuity_PPM curv_3 expressions

  Show description for f0e61f3
  Hallberg-NOAA

  committed
  f0e61f3

  Copy full SHA for f0e61f3

• (*)Add parentheses for oblique OBCs with FMAs

  Show description for 4f710ef
  Hallberg-NOAA

  committed
  4f710ef

  Copy full SHA for 4f710ef

• (*)Add parentheses for density_integrals with FMAs

  Show description for 9172cd5
  Hallberg-NOAA

  committed
  9172cd5

  Copy full SHA for 9172cd5

• (*)Add parentheses to 4 EOS int_density routines

  Show description for 24091cc
  Hallberg-NOAA

  committed
  24091cc

  Copy full SHA for 24091cc

• (*)Simplify density integral parentheses

  Show description for 8066a3d
  Hallberg-NOAA

  committed
  8066a3d

  Copy full SHA for 8066a3d

• (*)Parenthesize PressureForce_Montgomery for FMAs

  Show description for 99fd957
  Hallberg-NOAA

  committed
  99fd957

  Copy full SHA for 99fd957

• (*)Parenthesize calc_isoneutral_slopes for FMAs

  Show description for 307a4e2
  Hallberg-NOAA

  committed
  307a4e2

  Copy full SHA for 307a4e2

• (*)Parenthesize MOM_calc_varT for FMAs

  Show description for ce559ce
  Hallberg-NOAA

  committed
  ce559ce

  Copy full SHA for ce559ce

• (*)Parenthesize tracer_hordiff for FMAs

  Show description for c344a11
  Hallberg-NOAA

  committed
  c344a11

  Copy full SHA for c344a11

• (*)Parenthesize iceberg_forces for FMAs

  Show description for b2beab2
  Hallberg-NOAA

  committed
  b2beab2

  Copy full SHA for b2beab2

• (*)Parenthesize CoriolisStokes and LA_Stk for FMAs

  Show description for 5398e6f
  Hallberg-NOAA

  committed
  5398e6f

  Copy full SHA for 5398e6f

• +(*)Add and use G%Coriolis2Bu

  Show description for 56d053a
  Hallberg-NOAA

  committed
  56d053a

  Copy full SHA for 56d053a

• (*)Parenthesize thickness_diffuse for FMAs

  Show description for 49419f7
  Hallberg-NOAA

  committed
  49419f7

  Copy full SHA for 49419f7

• (*)Parenthesize Zanna_Bolton for FMAs

  Show description for 03dc6f9
  Hallberg-NOAA

  committed
  03dc6f9

  Copy full SHA for 03dc6f9

• (*)Parenthesize MOM_internal_tides for FMAs

  Show description for 654cd4a
  Hallberg-NOAA

  committed
  654cd4a

  Copy full SHA for 654cd4a

• (*)Parenthesize find_uv_at_h for FMAs

  Show description for ebf02a9
  Hallberg-NOAA

  committed
  ebf02a9

  Copy full SHA for ebf02a9

• (*)Parenthesize set_viscous_ML for FMAs

  Show description for c0bef18
  Hallberg-NOAA

  committed
  c0bef18

  Copy full SHA for c0bef18

• (*)Rearrange calc_kappa_shear_vertex for FMAs

  Show description for 0b50a15
  Hallberg-NOAA

  committed
  0b50a15

  Copy full SHA for 0b50a15

• (*)Parenthesize MOM_set_diffusivity for FMAs

  Show description for f0c52dd
  Hallberg-NOAA

  committed
  f0c52dd

  Copy full SHA for f0c52dd

• (*)Parenthesize CorAdCalc for FMAs

  Show description for 64b851c
  Hallberg-NOAA

  committed
  64b851c

  Copy full SHA for 64b851c

• (*)Parenthesize MOM_barotropic for FMAs

  Show description for 46e8b66
  Hallberg-NOAA

  committed
  46e8b66

  Copy full SHA for 46e8b66

• (*)Parenthesize MOM_lateral_mixing_coeffs for FMAs

  Show description for 6216fa1
  Hallberg-NOAA

  committed
  6216fa1

  Copy full SHA for 6216fa1

• (*)Parenthesize MOM_hor_visc for FMAs

  Show description for ffef92f
  Hallberg-NOAA

  committed
  ffef92f

  Copy full SHA for ffef92f

• (*)Parenthesize initialization squares for FMAs

  Show description for fc2af28
  Hallberg-NOAA

  committed
  fc2af28

  Copy full SHA for fc2af28

• (*)Parenthesize parameterization squares for FMAs

  Show description for 44f1130
  Hallberg-NOAA

  committed
  44f1130

  Copy full SHA for 44f1130

• (*)Parenthesize diagnostics for FMAs

  Show description for 182223c
  Hallberg-NOAA

  committed
  182223c

  Copy full SHA for 182223c

• (*)Parenthesize tracer_advect PPM edge values

  Show description for e810ac5
  Hallberg-NOAA

  committed
  e810ac5

  Copy full SHA for e810ac5

Commits on Jul 31, 2024

• (*)More parentheses in density_integrals for FMAs

  Show description for ffa766b
  Hallberg-NOAA

  committed
  ffa766b

  Copy full SHA for ffa766b

Commits on Aug 2, 2024

• (*)Add parentheses in end_value_h4 for FMAs

  Show description for fd82861
  Hallberg-NOAA

  committed
  fd82861

  Copy full SHA for fd82861

Commits on Aug 6, 2024

• Merge pull request NCAR#135 from DeniseWorthen/bugfix/initcplscalars

  Show description for 4b8777e
  jiandewang

  authored
  4b8777e

  Copy full SHA for 4b8777e

• Merge branch 'NOAA-EMC:dev/emc' into feature/update-to-main-20240531

  jiandewang

  authored
  5c9aee9

  Copy full SHA for 5c9aee9

Commits on Aug 16, 2024

• Merge pull request NCAR#136 from jiandewang/feature/update-to-main-20240531

  Show description for 00f8ea2
  jiandewang

  authored
  00f8ea2

  Copy full SHA for 00f8ea2

Commits on Aug 24, 2024

• Merge pull request mom-ocean#1634 from Hallberg-NOAA/FMA_rotational_symmetry_main

  Show description for ce58a32
  Hallberg-NOAA

  authored
  ce58a32

  Copy full SHA for ce58a32

Commits on Aug 25, 2024

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

  jiandewang

  committed
  e4df846

  Copy full SHA for e4df846

Commits on Sep 9, 2024

• Merge pull request NCAR#138 from jiandewang/feature/update-to-main-20240824

  Show description for 5e0c21f
  jiandewang

  authored
  5e0c21f

  Copy full SHA for 5e0c21f

Commits on Sep 14, 2024

• Merge pull request mom-ocean#1639 from jiandewang/dev-emc-20240909-cpl-scalar

  Show description for 05d8cc3
  jiandewang

  authored
  05d8cc3

  Copy full SHA for 05d8cc3

Commits on Nov 7, 2024

• merge latest main and resolve conflicts

  alperaltuntas

  committed
  a775c4d

  Copy full SHA for a775c4d