Code

Merge from main#1349

Code

Merged

adcroft merged 11 commits intomom-ocean:dev/gfdlmom-ocean/MOM6:dev/gfdlfrom marshallward:merge_from_mainmarshallward/MOM6:merge_from_mainCopy head branch name to clipboardMar 9, 2021

+70-60

Commits

Commits on Feb 25, 2021

• +New config_src directory structure

  Show description for 6e49a91
  Hallberg-NOAA

  committed
  6e49a91

  Copy full SHA for 6e49a91

• +MOM6/docs reflects the new directory structure

  Show description for 0d22f32
  Hallberg-NOAA

  committed
  0d22f32

  Copy full SHA for 0d22f32

• Update build scripts for new dir structure

  Show description for c0ddee0
  adcroft

  committed
  c0ddee0

  Copy full SHA for c0ddee0

• Correct path to FMS_cap in gnu:ice-ocean-nolibs job

  Show description for 95ed51f
  adcroft

  committed
  95ed51f

  Copy full SHA for 95ed51f

• Remove AC_CHECK_FILE for legacy MOM_memory.h

  Show description for efb3612
  marshallward

  committed
  efb3612

  Copy full SHA for efb3612

Commits on Feb 26, 2021

• Merge pull request #9 from marshallward/hallberg-fms2-acfix

  Show description for 8f0748c
  adcroft

  authored
  8f0748c

  Copy full SHA for 8f0748c

• Testing: Target uses local autoconf

  Show description for 3b8cc9c
  marshallward

  committed
  3b8cc9c

  Copy full SHA for 3b8cc9c

• Merge pull request #10 from marshallward/hallberg-fms2-acfix

  Show description for d2ec275
  adcroft

  authored
  d2ec275

  Copy full SHA for d2ec275

• Merge pull request mom-ocean#1341 from adcroft/Hallberg-NOAA-gfdl-fms2

  Show description for e0bda29
  marshallward

  authored
  e0bda29

  Copy full SHA for e0bda29

Commits on Mar 8, 2021

• Merge pull request mom-ocean#1342 from NOAA-GFDL/gfdl-fms2

  Show description for 4e05839
  marshallward

  authored
  4e05839

  Copy full SHA for 4e05839

Commits on Mar 9, 2021

• Merge branch 'main' into merge_from_main

  marshallward

  committed
  887c7af

  Copy full SHA for 887c7af