Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add conflict for MOVING_NEST option with GNU Fortran, use mcmodel=small on macOS arm64 (also contains #2017) #2164

Merged
merged 238 commits into from
Mar 11, 2024

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Feb 29, 2024

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
  • Commit 'test_changes.list' from previous step n/a - no changes to baseline, file wasn't produced during RT run

Description:

  1. This PR contains all the changes from PLATFORM 989/PLATFORM 1000 - Develop a label (manual) triggered pipeline based on CM team's approval of UFS-WM. New and improved, now with parallelization. (Combined PR 2057 and PR 2039) #2017
  2. Fix a compiler error on macOS arm64, where gfortran doesn't understand -mcmodel=medium.
  3. Throw an error when trying to compile the MOVING_NEST option with GNU (only supported for Intel)
  4. Submodule pointer update for fv3atm and ccpp-framework for changes listed in the associated PRs below

Testing

Aside from regression testing:

  1. I tested that the MOVING_NEST build errors out immediately with GNU Fortran:
CMake Error at cmake/GNU.cmake:3 (message):
  Option MOVING_NEST not compatible with GNU}
Call Stack (most recent call first):
  CMakeLists.txt:137 (include)
  1. I tested that the atm_dyn32_phy32_debug compile option compiles successfully on my macOS arm64

Commit Message:

* UFSWM - "Add conflict for MOVING_NEST option with GNU Fortran, use mcmodel=small on macOS arm64"
  * AQM - 
  * CDEPS - 
  * CICE - 
  * CMEPS - 
  * CMakeModules - 
  * FV3 - "Bug fix for unallocated array sfcprop%wetness in GFS_diagnostics.F90"
    * ccpp-physics - 
    * ccpp-framework - "Bug fix required to use chunked arrays and retain backward compatibility with blocked data structures in ccpp_prebuild.py"
    * atmos_cubed_sphere - 
  * GOCART - 
  * HYCOM - 
  * MOM6 - 
  * NOAHMP - 
  * WW3 - 
  * stochastic_physics - 

Priority:

  • Normal.

Git Tracking

UFSWM:

Resolves #2159
Resolves #2155
Resolves #2151

Sub component Pull Requests:

UFSWM Blocking Dependencies:

This is part of a set of (independent) PRs:

Changes

Regression Test Changes (Please commit test_changes.list):

No Baseline Changes.

Input data Changes:

None

Library Changes/Upgrades:

None


Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

kbooker79 and others added 30 commits November 29, 2023 10:18
 on-behalf-of @ufs-community <ecc.platform@noaa.gov>
@zach1221 zach1221 removed the derecho-RT Run regression tests on Derecho label Mar 8, 2024
 on-behalf-of @ufs-community <ecc.platform@noaa.gov>
@zach1221 zach1221 added orion-RT and removed orion-RT labels Mar 8, 2024
 on-behalf-of @ufs-community <ecc.platform@noaa.gov>
@zach1221 zach1221 added hera-RT Run Hera regression testing and removed hera-RT Run Hera regression testing labels Mar 8, 2024
@zach1221 zach1221 added the hera-RT Run Hera regression testing label Mar 9, 2024
 on-behalf-of @ufs-community <ecc.platform@noaa.gov>
@epic-cicd-jenkins epic-cicd-jenkins removed the hera-RT Run Hera regression testing label Mar 9, 2024
@BrianCurtis-NOAA
Copy link
Collaborator

Acorn: We are still working on addressing the build/run issues there. Can skip.

@zach1221
Copy link
Collaborator

Ok, testing is complete here. We can begin merge process starting with the ccpp-framework sub-pr.

@zach1221
Copy link
Collaborator

@climbfuji fv3atm is now merged as well.
NOAA-EMC/fv3atm@062f795

@climbfuji
Copy link
Collaborator Author

This should be ready for merging, please check

@zach1221 zach1221 merged commit 5b62e1a into ufs-community:develop Mar 11, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
9 participants