Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
cd19c38
Use ip@5: if available instead of sp if available
climbfuji Oct 7, 2024
89f3bab
Adding no OpenMP flag
scrasmussen Mar 24, 2026
b97d575
sp to ip changes in ccpp-physics repo, enhancement/build-with-ip branch
scrasmussen Mar 24, 2026
f78c1dd
sp to ip changes in ccpp-physics repo, enhancement/build-with-ip branch
scrasmussen Feb 25, 2026
e8d6fa1
-O2 to -O0 changes required to get ifx 2025.2.1 to build on Derecho. …
scrasmussen Feb 26, 2026
0ff17e3
Module variables to build spack stack 2.0.0 and 1.9.3. Note 2.0.0 doe…
scrasmussen Feb 26, 2026
2e62b76
add GNU module for Ursa with spack-stack 2.0.0
grantfirl Mar 12, 2026
306607d
use intel-specific spack-stack 2.0.0 python environment in ursa intel…
grantfirl Mar 12, 2026
75a1840
Supported case arm_sgp_summer_1997_A requires SCM_GFS_v16_ps suite to…
scrasmussen Mar 28, 2026
82b1cb9
Use scm/dev ccpp-physics
scrasmussen Mar 28, 2026
d6d217a
- Using name/version format for spackstack and derecho_gnu and derech…
scrasmussen Mar 28, 2026
7d37d1f
point to ccpp-physics IP PR into scm/dev
grantfirl Mar 31, 2026
2f23c75
add run list arugment to suite_info to only compile subset of suites …
grantfirl Mar 31, 2026
47bb8b1
add rl option to CMakeLists.txt to compile smaller subset of suites i…
grantfirl Mar 31, 2026
dcd1979
remove warning prints; use default rl if no match
grantfirl Mar 31, 2026
f4904e5
revert optimization change and edit to supported_suites.py
Apr 1, 2026
92d7d44
Merge pull request #11 from grantfirl/add_rl_type
scrasmussen Apr 1, 2026
122be00
Removing supported_cases.py and supported_suites.py since they have b…
scrasmussen Apr 1, 2026
b269c26
Add emacs as a shell function, pointing to an emacs executable on Der…
scrasmussen Apr 1, 2026
c1aa907
Switch DEFAULT_SUITE_BEHAVIOR to supported from regression_test. Whit…
scrasmussen Apr 2, 2026
560b0bb
Removing spack_stack from module name
scrasmussen Apr 7, 2026
0f29bb5
Moving hera and ursa module files to be versioned modules
scrasmussen Apr 7, 2026
bb0168a
Converting documentation code blocks to use the traditional $ to indi…
scrasmussen Apr 8, 2026
e4e87df
Make the default documenation opened the latest, instead of v7.0.0
scrasmussen Apr 8, 2026
007a1d5
Add additional details regarding suite_info.py and the default suppor…
scrasmussen Apr 8, 2026
663ace6
update ccpp/physics after merge
grantfirl Apr 10, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
branch = develop
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
# url = https://github.com/NCAR/ccpp-physics
url = https://github.com/grantfirl/ccpp-physics
branch = scm/dev-ip_update
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 2 files
+5 −1 CMakeLists.txt
+1 −184 CODEOWNERS
1 change: 1 addition & 0 deletions scm/etc/modules/derecho_gnu/.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module_version("derecho_gnu/spack_stack_2.1.0", "default")
28 changes: 28 additions & 0 deletions scm/etc/modules/derecho_gnu/spack_stack_1.9.3.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
help([[
This module loads libraries for building the CCPP Single-Column Model on
the CISL machine Derecho (Cray) using GNU 12.4.0
]])

whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Derecho with GNU compilers]===])

prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.9.3/envs/ue-gcc-12.4.0/install/modulefiles/Core/")

load("stack-gcc/12.4.0")
load("stack-cray-mpich/8.1.29")
load("stack-python/3.11.7")
load("cmake/3.27.9")

load("hdf5/1.14.3")
load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.1")
load("bacio/2.4.1")
load("ip/5.1.0")
load("w3emc/2.10.0")

load("py-f90nml")
load("py-netcdf4/1.7.1.post2")

setenv("CMAKE_C_COMPILER","mpicc")
setenv("CMAKE_CXX_COMPILER","mpicxx")
setenv("CMAKE_Fortran_COMPILER","mpif90")
setenv("CMAKE_Platform","derecho.gnu")
28 changes: 28 additions & 0 deletions scm/etc/modules/derecho_gnu/spack_stack_2.1.0.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
help([[
This module loads libraries for building the CCPP Single-Column Model on
the CISL machine Derecho (Cray) using GNU 13.3.1
]])

whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Derecho with GNU compilers]===])

prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.1.0/envs/ue-gcc-13.3.1/modules/Core/")

load("stack-gcc/13.3.1")
load("stack-cray-mpich/8.1.32")
load("python/3.11.11")
load("cmake/3.31.8")

load("hdf5/1.14.5")
load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.1")
load("bacio/2.6.0")
load("ip/5.4.0")
load("w3emc/2.13.0")

load("py-f90nml/1.4.3")
load("py-netcdf4/1.7.2")

setenv("CMAKE_C_COMPILER","mpicc")
setenv("CMAKE_CXX_COMPILER","mpicxx")
setenv("CMAKE_Fortran_COMPILER","mpif90")
setenv("CMAKE_Platform","derecho.gnu")
1 change: 1 addition & 0 deletions scm/etc/modules/derecho_intel/.modulerc.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
module_version("derecho_intel/spack_stack_2.0.0", "default")
29 changes: 29 additions & 0 deletions scm/etc/modules/derecho_intel/spack_stack_2.0.0.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
help([[
This module loads libraries for building the CCPP Single-Column Model on
the CISL machine Derecho (Cray) using Intel oneAPI 2025.2.1
]])

whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Derecho with Intel compilers]===])


prepend_path("MODULEPATH","/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-2.0.0/envs/ue-oneapi-2025.2.1/modules/Core/")

load("stack-intel-oneapi-compilers/2025.2.1")
load("stack-cray-mpich/8.1.32")
load("python/3.11.11")
load("cmake/3.31.8")

load("hdf5/1.14.5")
load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.1")
load("bacio/2.6.0")
load("ip/5.4.0")
load("w3emc/2.11.0")

load("py-f90nml")
load("py-netcdf4/1.7.2")

setenv("CMAKE_C_COMPILER","cc")
setenv("CMAKE_CXX_COMPILER","CC")
setenv("CMAKE_Fortran_COMPILER","ftn")
setenv("CMAKE_Platform","derecho.intel")
31 changes: 31 additions & 0 deletions scm/etc/modules/ursa_gnu_spack_stack_2.0.0.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
help([[
This module loads libraries for building the CCPP Single-Column Model on
the NOAA RDHPC machine Ursa using GNU 12.4
]])

whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Ursa with Intel compilers ]===])

prepend_path("MODULEPATH","/contrib/spack-stack/spack-stack-2.0.0/envs/ue-gcc-12.4.0/modules/Core")

load("stack-gcc/12.4.0")
load("stack-openmpi/4.1.6")
load("python/3.11.11")
load("cmake/3.31.8")

load("hdf5/1.14.5")
load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.1")
load("bacio/2.6.0")
load("ip/5.4.0")
load("w3emc/2.11.0")
load("esmf/8.8.0")

load("py-f90nml")
load("py-netcdf4/1.7.2")

setenv("CMAKE_C_COMPILER","mpicc")
setenv("CMAKE_CXX_COMPILER","mpicxx")
setenv("CMAKE_Fortran_COMPILER","mpif90")
setenv("CMAKE_Platform","ursa.gnu")

execute{cmd="source /scratch3/BMC/gmtb/ccpp-scm-software/spack-stack-2.0.0-gnu/bin/activate", modeA={"load"}}
31 changes: 31 additions & 0 deletions scm/etc/modules/ursa_intel_spack_stack_2.0.0.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
help([[
This module loads libraries for building the CCPP Single-Column Model on
the NOAA RDHPC machine Ursa using Intel oneAPI 2025.2.1
]])

whatis([===[Loads spack-stack libraries needed for building the CCPP SCM on Ursa with Intel compilers ]===])

prepend_path("MODULEPATH","/contrib/spack-stack/spack-stack-2.0.0/envs/ue-oneapi-2025.2.1/modules/Core")

load("stack-intel-oneapi-compilers/2025.2.1")
load("stack-intel-oneapi-mpi/2021.13")
load("python/3.11.11")
load("cmake/3.31.8")

load("hdf5/1.14.5")
load("netcdf-c/4.9.2")
load("netcdf-fortran/4.6.1")
load("bacio/2.6.0")
load("ip/5.4.0")
load("w3emc/2.11.0")
load("esmf/8.8.0")

load("py-f90nml")
load("py-netcdf4/1.7.2")

setenv("CMAKE_C_COMPILER","cc")
setenv("CMAKE_CXX_COMPILER","CC")
setenv("CMAKE_Fortran_COMPILER","ftn")
setenv("CMAKE_Platform","ursa.intel")

execute{cmd="source /scratch3/BMC/gmtb/ccpp-scm-software/spack-stack-2.0.0-intel/bin/activate", modeA={"load"}}
40 changes: 30 additions & 10 deletions scm/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/../../CMakeModule

find_package(NetCDF REQUIRED COMPONENTS C Fortran)
find_package(bacio REQUIRED)
find_package(sp REQUIRED)
# Use ip@5 or later if available, fall back to sp
find_package(ip 5)
if(NOT ip_FOUND)
find_package(sp REQUIRED)
endif()
find_package(w3emc REQUIRED)
find_package(MPI REQUIRED)
if(NOT MPI_Fortran_HAVE_F08_MODULE)
Expand Down Expand Up @@ -156,6 +160,7 @@ endif()
if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
message(STATUS "Compile using GNU")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -ggdb -fbacktrace -cpp -fcray-pointer -ffree-line-length-none -fno-range-check")
set(CMAKE_Fortran_FLAGS_OPENMP_OFF "-fno-openmp")

if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
Expand Down Expand Up @@ -184,6 +189,7 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
message(STATUS "Compile using Intel OneAPI")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -fpp -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -align array64byte -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source")
set(CMAKE_Fortran_FLAGS_OPENMP_OFF "-fno-openmp")

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
Expand Down Expand Up @@ -223,6 +229,7 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
message(STATUS "Compile using Intel Classic")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback -fpp -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -nowarn -sox -align array64byte -qno-opt-dynamic-align")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -qno-opt-dynamic-align -sox -fp-model source")
set(CMAKE_Fortran_FLAGS_OPENMP_OFF "-fno-openmp")

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -real-size 64")
Expand All @@ -233,11 +240,11 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -ftrapuv")
else()
if(32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3")
else()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O2 -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3 -no-prec-div -no-prec-sqrt")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -debug minimal -fp-model source -qoverride-limits -qopt-prefetch=3 -no-prec-div")
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O2 -debug minimal")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -debug minimal")
set(FAST "-fast-transcendentals")
if(AVX2)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -march=core-avx2")
Expand All @@ -252,7 +259,7 @@ if (${CMAKE_Fortran_COMPILER_ID} MATCHES "GNU")
endif()

set(CMAKE_C_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_RELEASE "-O0 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_C_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)
set(CMAKE_Fortran_FLAGS_BITFORBIT "-O2 -fPIC" CACHE STRING "" FORCE)

Expand All @@ -268,6 +275,7 @@ elseif (${CMAKE_Fortran_COMPILER_ID} MATCHES "NVHPC")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
endif()
set(CMAKE_Fortran_FLAGS_OPENMP_OFF "-nomp")

if(NOT 32BIT)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -r8")
Expand Down Expand Up @@ -302,7 +310,7 @@ if(32BIT)
message(STATUS "Compile CCPP slow physics with 64-bit precision, fast physics with 32-bit precision")
add_definitions(-DOVERLOAD_R4)
if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
# set(CMAKE_Fortran_FLAGS_PHYSICS "-real-size 64 -no-prec-div -no-prec-sqrt")
# set(CMAKE_Fortran_FLAGS_PHYSICS "-real-size 64 -no-prec-div")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
# set(CMAKE_Fortran_FLAGS_PHYSICS "-fdefault-real-8 -fdefault-double-8")
endif()
Expand Down Expand Up @@ -367,11 +375,23 @@ SET(scm_source_files scm.F90
ADD_EXECUTABLE(scm ${scm_source_files} ccpp_static_api.F90)

if(OPENMP)
TARGET_LINK_LIBRARIES(scm PUBLIC OpenMP::OpenMP_Fortran)
target_link_libraries(scm OpenMP::OpenMP_Fortran)
endif()
target_link_libraries(scm NetCDF::NetCDF_Fortran)
if(TARGET bacio::bacio)
set(BACIO_TARGET bacio::bacio)
elseif(TARGET bacio::bacio_4)
set(BACIO_TARGET bacio::bacio_4)
else()
message(FATAL_ERROR
"bacio found but expected target not exported (bacio::bacio or bacio::bacio_4)")
endif()
target_link_libraries(scm ${BACIO_TARGET})
if(ip_FOUND)
target_link_libraries(scm ip::ip_d)
else()
target_link_libraries(scm sp::sp_d)
endif()
TARGET_LINK_LIBRARIES(scm NetCDF::NetCDF_Fortran)
TARGET_LINK_LIBRARIES(scm bacio::bacio_4)
TARGET_LINK_LIBRARIES(scm sp::sp_d)
TARGET_LINK_LIBRARIES(scm w3emc::w3emc_d)
TARGET_LINK_LIBRARIES(scm ccpp_framework)
TARGET_LINK_LIBRARIES(scm ccpp_physics)
Expand Down
3 changes: 1 addition & 2 deletions scm/src/supported_suites.py
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
suites = ["SCM_GFS_v16","SCM_GFS_v16_RRTMGP","SCM_GFS_v17_p8_ugwpv1","SCM_HRRR_gf","SCM_WoFS_v0"]

suites = ["SCM_GFS_v16","SCM_GFS_v16_ps","SCM_GFS_v16_RRTMGP","SCM_GFS_v17_p8_ugwpv1","SCM_HRRR_gf","SCM_WoFS_v0"]

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that adding SCM_GFS_v16_ps should be necessary. Let me look.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that supported_suites and supported_cases are actually used anymore by anything. I really don't understand why this was necessary.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I and I believe @hertneky, use supported suites and cases as the minimum list of suites and cases to test. I didn't use them before ifx, because I'd just use Intel to build everything at once.

I agree they don't seem to be used by anything, so if they don't represent the minimum list of suites and cases we support, we might want to discuss removing these files in the SCM meeting.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ya, I think these have been entirely supplanted by suite_info.py. I think that they should be removed.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I see now, thanks for the explanation! I'll add a commit removing those two files

Loading