Skip to content

Sync sub-repos for PR to main#455

Merged
adcroft merged 1 commit into
NOAA-GFDL:dev/gfdlfrom
adcroft:gfdl-to-main-2024-05-16
May 17, 2024
Merged

Sync sub-repos for PR to main#455
adcroft merged 1 commit into
NOAA-GFDL:dev/gfdlfrom
adcroft:gfdl-to-main-2024-05-16

Conversation

@adcroft
Copy link
Copy Markdown
Member

@adcroft adcroft commented May 17, 2024

  • Sub-repos src/icebergs, src/SIS2, and src/MOM6 were updated to dev/gfdl without any changes to doc strings or results.
  • In preparation for PR to MOM6/main.

src/MOM6:

  • NOAA_GFDL/MOM6@6272bbcdc Testing: Correct perf parsing of C++ output
  • NOAA_GFDL/MOM6@e25388369 Merge branch 'main' into dev/gfdl
  • NOAA_GFDL/MOM6@0c790f2dc SAL: Explicitly allocate sht variable in SAL_CS
  • NOAA_GFDL/MOM6@129e1bda0 Merge pull request #1623 from jiandewang/DEV-EMC-candidate-20240425
  • NOAA_GFDL/MOM6@a89d085bf Merge pull request combine the refineDiag scripts under tools/analysis into one #12 from marshallward/db_type_fix
  • NOAA_GFDL/MOM6@aac5bb846 Replace db array default values with real literals
  • NOAA_GFDL/MOM6@0730606b8 Merge pull request User/smg/diag table updates #132 from jiandewang/feature/update-to-main-20240401
  • NOAA_GFDL/MOM6@6d0150d6c Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20240401
  • NOAA_GFDL/MOM6@ab7bd14d2 Merge pull request New version of FMS and other submodules #130 from marshallward/emc_fix_warn
  • NOAA_GFDL/MOM6@dc248836f Error cleanup (Intel Fortran)
  • NOAA_GFDL/MOM6@10521a921 Merge pull request Veritcal levels in TS_drift.py were reversed #127 from jiandewang/feature/update-to-main-20240228

src/SIS2:

src/icebergs:

- Sub-repos src/icebergs, src/SIS2, and src/MOM6 were updated to dev/gfdl without
  any changes to doc strings or results.
- In preparation for PR to MOM6/main.

src/MOM6:
- NOAA_GFDL/MOM6@6272bbcdc Testing: Correct perf parsing of C++ output
- NOAA_GFDL/MOM6@e25388369 Merge branch 'main' into dev/gfdl
- NOAA_GFDL/MOM6@0c790f2dc SAL: Explicitly allocate sht variable in SAL_CS
- NOAA_GFDL/MOM6@129e1bda0 Merge pull request #1623 from jiandewang/DEV-EMC-candidate-20240425
- NOAA_GFDL/MOM6@a89d085bf Merge pull request NOAA-GFDL#12 from marshallward/db_type_fix
- NOAA_GFDL/MOM6@aac5bb846 Replace db array default values with real literals
- NOAA_GFDL/MOM6@0730606b8 Merge pull request NOAA-GFDL#132 from jiandewang/feature/update-to-main-20240401
- NOAA_GFDL/MOM6@6d0150d6c Merge remote-tracking branch 'MAIN/main' into feature/update-to-main-20240401
- NOAA_GFDL/MOM6@ab7bd14d2 Merge pull request NOAA-GFDL#130 from marshallward/emc_fix_warn
- NOAA_GFDL/MOM6@dc248836f Error cleanup (Intel Fortran)
- NOAA_GFDL/MOM6@10521a921 Merge pull request NOAA-GFDL#127 from jiandewang/feature/update-to-main-20240228

src/SIS2:
- NOAA-GFDL/SIS2@00c3b5b Fix to READ_HLIM_VALS
- NOAA-GFDL/SIS2@2007324 Fix to READ_HLIM_VALS
- NOAA-GFDL/SIS2@022bd89 Fix for specified ice layout non repro issue

src/icebergs:
- NOAA_GFDL/icebergs@729b231 Merge pull request NOAA-GFDL#69 from alex-huth/iOM4_with_bergs
- NOAA_GFDL/icebergs@4abac9e fixed heat budget
- NOAA_GFDL/icebergs@e8f794b Merge pull request NOAA-GFDL#68 from alex-huth/iOM4_with_bergs
- NOAA_GFDL/icebergs@9d77ef1 Several miscellaneous updates
- NOAA_GFDL/icebergs@89cf3e6 Use masked-out SST to determine units of SST
- NOAA_GFDL/icebergs@9c8266d fixed noted units of calving
@adcroft adcroft force-pushed the gfdl-to-main-2024-05-16 branch from 5c3a5c5 to 851d20d Compare May 17, 2024 21:03
@adcroft adcroft merged commit 86ea2ff into NOAA-GFDL:dev/gfdl May 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant