Skip to content

Spack-stack 1.5.1, ESMF 8.5.0, FMS 2023.02.01 + Remove Gaea C4 + Fix build system to allow CMAKE_<COMPILER>_FLAGS to be specified for submodules #2052 #2013

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.

Sign up for GitHub

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

Merged
jkbk2004 merged 49 commits into from
Jan 8, 2024
Merged

Spack-stack 1.5.1, ESMF 8.5.0, FMS 2023.02.01 + Remove Gaea C4 + Fix build system to allow CMAKE_<COMPILER>_FLAGS to be specified for submodules #2052 #2013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
6a35148
bmark time increase
FernandoAndrade-NOAA Nov 29, 2023
235ce21
spack-stack-151 & common updates
FernandoAndrade-NOAA Nov 29, 2023
5dcd22d
Update ufs_jet.intel.lua
FernandoAndrade-NOAA Nov 29, 2023
1bded76
Update ufs_gaea.intel.lua cmake
FernandoAndrade-NOAA Nov 30, 2023
7d5d74c
Merge branch 'ufs-community:develop' into feature/spack_stack_151
FernandoAndrade-NOAA Dec 4, 2023
3f273ec
fix ufs_hercules.gnu.lua path
FernandoAndrade-NOAA Dec 4, 2023
97680f2
Merge branch 'develop' into feature/spack_stack_151
FernandoAndrade-NOAA Dec 4, 2023
d7d9e3a
ufs_gaea-c5.intel.lua spack-stack 1.5.1
FernandoAndrade-NOAA Dec 4, 2023
459b800
switch to fms/2023.02.01
FernandoAndrade-NOAA Dec 4, 2023
990eda6
revert gaea c4 spack-stack 1.5.0
FernandoAndrade-NOAA Dec 5, 2023
324a6e9
Merge branch 'develop' into feature/spack_stack_151
BrianCurtis-NOAA Dec 8, 2023
e498be3
remove gaea c4
FernandoAndrade-NOAA Dec 8, 2023
d6f8b3a
Merge branch 'develop' into feature/spack_stack_151
FernandoAndrade-NOAA Dec 11, 2023
d375110
switch to fv3/use_fms_mpp
FernandoAndrade-NOAA Dec 12, 2023
f0a4c65
rm gaea c4 cmake config and RT log
FernandoAndrade-NOAA Dec 12, 2023
2fb9708
revert regional_atmaq_faster
FernandoAndrade-NOAA Dec 13, 2023
df58a12
resync develop & merge conflict
FernandoAndrade-NOAA Dec 13, 2023
96f26c5
WCOSS2 LUA changes to match updates in spack-stack 1.5.1
BrianCurtis-NOAA Dec 14, 2023
2212f50
Update ufs_hercules.gnu.lua gcc for 1.5.1
FernandoAndrade-NOAA Dec 14, 2023
e6622c6
Merge branch 'develop' into feature/spack_stack_151
FernandoAndrade-NOAA Dec 15, 2023
99c57e0
Update ufs_derecho.intel.lua spack-stack 1.5.1
FernandoAndrade-NOAA Dec 15, 2023
4f0e28a
Fixing CMAKE_Fortran_FLAGS to be passed from top level to submodules
mark-a-potts Dec 18, 2023
f6a26e6
fixed c flags for cice
mark-a-potts Dec 18, 2023
82ed8b3
Successful regression tests on Hercules
mark-a-potts Dec 18, 2023
54cab40
Merge branch 'feature/fortran-flags' of https://github.com/NOAA-EPIC/…
mark-a-potts Dec 18, 2023
13bffd4
FV3 hash update to sync with develop
jkbk2004 Jan 4, 2024
14f4b5b
sync with develop branch
jkbk2004 Jan 4, 2024
24b1ccd
sync with develop branch
jkbk2004 Jan 4, 2024
955f023
update FV3 hash
jkbk2004 Jan 4, 2024
0e335c5
Merge remote-tracking branch 'upstream/feature/fortran-flags' into fe…
jkbk2004 Jan 4, 2024
902e0b5
sync stoch hash with deveop
jkbk2004 Jan 4, 2024
2ef2b7a
sync CMEPS hash with develop
jkbk2004 Jan 4, 2024
663e707
turn off some gnu cases: hercules/gnu issue
jkbk2004 Jan 4, 2024
df355ce
Update bl_date.conf
jkbk2004 Jan 4, 2024
73dd1b3
add control_p8_gnu ORT logs: passed
zach1221 Jan 5, 2024
2ac4f5f
add cpld_control_nowave_noaero_p8_gnu ORT logs: passed
zach1221 Jan 5, 2024
2893537
add hera RT log: passed
jkbk2004 Jan 5, 2024
c252559
Merge branch 'feature/spack_stack_151' of https://github.com/Fernando…
jkbk2004 Jan 5, 2024
427dc63
add regional_control_gnu ORT logs: passed
zach1221 Jan 5, 2024
2914565
add gaea-c5 RT logs: passed
zach1221 Jan 5, 2024
f91ccf6
add hercules RT log: passed
jkbk2004 Jan 5, 2024
265cabc
add derecho RT log: passed
jkbk2004 Jan 5, 2024
e53b3cf
add orion RT logs: passed
zach1221 Jan 5, 2024
66c90a5
WCOSS2 RT Log
BrianCurtis-NOAA Jan 5, 2024
270724d
Acorn RT Log
BrianCurtis-NOAA Jan 5, 2024
4316947
add jet RT log: passed
jkbk2004 Jan 5, 2024
958adab
update FV3 hash and revert changes in gitmodules
jkbk2004 Jan 6, 2024
94bdef3
Bring in lua changes on Acorn
BrianCurtis-NOAA Jan 8, 2024
0c368f3
Merge branch 'feature/spack_stack_151' of github.com:FernandoAndrade-…
BrianCurtis-NOAA Jan 8, 2024
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
4 changes: 2 additions & 2 deletions CDEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# CDEPS compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace -ffree-line-length-none")
#Set CPP defintions for the ufs/cdeps_share target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
Expand All @@ -9,7 +9,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
Expand Down
13 changes: 5 additions & 8 deletions CICE-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### CICE Fortran compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fconvert=big-endian -ffree-line-length-none ")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
Expand All @@ -9,7 +9,7 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -Wall -Wextra -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "" )
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -FR -convert big_endian -assume byterecl -ftz -align array64byte")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check uninit -check bounds -check pointers -fpe0 -check noarg_temp_created -init=snan,arrays")
Expand All @@ -20,20 +20,17 @@ endif()

### CICE C compiler flags
if(CMAKE_C_COMPILER_ID MATCHES "GNU")
set(CMAKE_C_FLAGS "-g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set(CMAKE_C_FLAGS_RELEASE "-O3")
set(CMAKE_C_FLAGS_DEBUG "-O0")
set(CMAKE_C_LINK_FLAGS "")
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
set( CMAKE_C_FLAGS "-g -traceback")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -traceback")
set( CMAKE_C_FLAGS_RELEASE "-O2 -fp-model precise")
set( CMAKE_C_FLAGS_DEBUG "-O0 -ftrapuv")
set( CMAKE_C_LINK_FLAGS "")
elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "-g")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g")
set( CMAKE_C_FLAGS_RELEASE "-O3" )
set( CMAKE_C_FLAGS_DEBUG "-O0" )
set( CMAKE_C_LINK_FLAGS "" )
Expand Down
5 changes: 2 additions & 3 deletions CMEPS-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
###############################################################################

if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace -ffree-line-length-none")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace -ffree-line-length-none")
#Set CPP defintions for the ufs/cdeps_share source component of the cmeps target library
list(APPEND CDEPS_SHARE_DEFS "CPRGNU")
if(${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fallow-argument-mismatch -fallow-invalid-boz")
endif()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS}")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -O -assume realloc_lhs")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -fp-model precise")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -check -check noarg_temp_created -check nopointer -fpe0 -ftrapuv -init=snan,arrays")
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 997907 to 5e7f19
4 changes: 2 additions & 2 deletions MOM6-interface/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
### MOM6 Fortran compiler flags
if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
set(CMAKE_Fortran_FLAGS "-g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -fbacktrace")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-double-8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Waliasing -fcray-pointer -fconvert=big-endian -ffree-line-length-none -fno-range-check -fbacktrace")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2")
set(CMAKE_Fortran_FLAGS_DEBUG "-O0 -fcheck=bounds -ffpe-trap=invalid,zero,overflow,underflow" )
set(CMAKE_Fortran_LINK_FLAGS "")
elseif(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
set(CMAKE_Fortran_FLAGS "-g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g -traceback")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -i4 -r8")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fno-alias -auto -safe-cray-ptr -ftz -assume byterecl -sox")
set(CMAKE_Fortran_FLAGS_RELEASE "-O2 -debug minimal -fp-model source")
Expand Down
4 changes: 0 additions & 4 deletions cmake/configure_gaea.intel.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modulefiles/ufs_acorn.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
Load environment to build UFS on Acorn with Intel compiler
]])

prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lfs/h1/emc/nceplibs/noscrub/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

load("stack-intel")
load("stack-cray-mpich")
Expand Down
8 changes: 4 additions & 4 deletions modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@ local ufs_modules = {
{["netcdf-c"] = "4.9.2"},
{["netcdf-fortran"] = "4.6.0"},
{["parallelio"] = "2.5.10"},
{["esmf"] = "8.4.2"},
{["fms"] = "2023.01"},
{["esmf"] = "8.5.0"},
{["fms"] = "2023.02.01"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "4.3.0"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.10.0"},
{["gftl-shared"] = "1.5.0"},
{["mapl"] = "2.35.2-esmf-8.4.2"},
{["gftl-shared"] = "1.6.1"},
{["mapl"] = "2.40.3-esmf-8.5.0"},
{["scotch"] = "7.0.4"},
}

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ load("mysql/8.0.33")

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

unload("ncarcompilers")
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea-c5.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ load("intel-classic/2023.1.0")
load("cray-mpich/8.1.25")
load("python/3.9.12")

prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/lustre/f2/dev/wpo/role.epic/contrib/spack-stack/c5/modulefiles")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
Expand Down
35 changes: 0 additions & 35 deletions modulefiles/ufs_gaea.intel.lua
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hera/GNU
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
-- for openmpi, need
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hera/Intel
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env-noavx512/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

Comment thread
BrianCurtis-NOAA marked this conversation as resolved.
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/ufs_hercules.gnu.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ help([[
loads UFS Model prerequisites for Hercules/GNU
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env-mvap2/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")
-- for mvapich2, need:
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles")

stack_gnu_ver=os.getenv("stack_gnu_ver") or "11.3.1"
stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0"
load(pathJoin("stack-gcc", stack_gnu_ver))

stack_mvapich2_ver=os.getenv("stack_mvapich2_ver") or "2.3.7"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hercules.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hercules/Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_jet.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Jet/Intel
]])

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Orion/Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.5.1/envs/unified-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
18 changes: 9 additions & 9 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")
--prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/compiler/intel/19.1.3.304")
--prepend_path("MODULEPATH", "/apps/test/hpc-stack/i-19.1.3.304__m-8.1.12__h-1.14.0__n-4.9.2__p-2.5.10__e-8.4.2/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.12")

local ufs_modules = {
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.14.0"},
{["netcdf"] = "4.9.2"},
{["pio"] = "2.5.10"},
{["esmf"] = "8.4.2"},
{["fms"] = "2023.01"},
{["hdf5-B"] = "1.14.0"},
{["netcdf-B"] = "4.9.2"},
{["pio-B"] = "2.5.10"},
{["esmf-B"] = "8.5.0"},
{["fms"] = "2023.02.01"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "v1.5.0"},
{["mapl"] = "2.35.2-esmf-8.4.2"},
{["gftl-shared"] = "1.6.1"},
{["mapl-B"] = "2.40.3"},
}

for i = 1, #ufs_modules do
Expand Down
5 changes: 0 additions & 5 deletions tests/auto-jenkins/jobs/bl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ def set_directories(job_obj):
blstore = '/lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/'
rtbldir = '/lfs4/HFIP/h-nems/emc.nemspara/RT_BASELINE/'\
f'emc.nemspara/FV3_RT/REGRESSION_TEST'
elif job_obj.machine == 'gaea':
workdir = '/lustre/f2/pdata/ncep/emc.nemspara/autort/pr'
blstore = '/lustre/f2/pdata/ncep/role.epic/RT/NEMSfv3gfs'
rtbldir = '/lustre/f2/scratch/emc.nemspara/FV3_RT/'\
f'REGRESSION_TEST'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/tests/auto/pr'
blstore = '/work/noaa/epic/UFS-WM_RT/NEMSfv3gfs'
Expand Down
2 changes: 0 additions & 2 deletions tests/auto-jenkins/jobs/rt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ def set_directories(job_obj):
workdir = '/scratch1/NCEPDEV/nems/role.epic/autort/pr'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/hfv3gfs/role.epic/autort/pr'
elif job_obj.machine == 'gaea':
workdir = '/lustre/f2/pdata/ncep/role.epic/autort/pr'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/tests/auto/pr'
elif job_obj.machine == 'hercules':
Expand Down
7 changes: 0 additions & 7 deletions tests/auto-jenkins/rt_auto_jenkins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ def delete_pr_dirs(each_pr, machine):
workdir = '/scratch1/NCEPDEV/nems/role.epic/autort/pr'
elif machine == 'jet':
workdir = '/lfs4/HFIP/hfv3gfs/role.epic/autort/pr'
elif machine == 'gaea':
workdir = '/lustre/f2/pdata/ncep/role.epic/autort/pr'
elif machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/pr'
elif machine == 'hercules':
Expand Down Expand Up @@ -114,8 +112,6 @@ def delete_rt_dirs(in_dir, machine, workdir):
elif machine == 'jet':
rt_dir ='/lfs4/HFIP/hfv3gfs/role.epic/RT_BASELINE/'\
f'emc.nemspara/FV3_RT'
elif machine == 'gaea':
rt_dir = '/lustre/f2/scratch/role.epic/FV3_RT'
elif machine == 'orion':
rt_dir = '/work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT'
elif machine == 'hercules':
Expand Down Expand Up @@ -292,9 +288,6 @@ def setup_env():
elif bool(re.match(re.compile('tfe.+'), hostname)):
machine = 'jet'
os.environ['ACCNR'] = 'hfv3gfs'
elif bool(re.match(re.compile('gaea.+'), hostname)):
machine = 'gaea'
os.environ['ACCNR'] = 'nggps_emc'
elif bool(re.match(re.compile('Orion-login.+'), hostname)):
machine = 'orion'
os.environ['ACCNR'] = 'epic-ps'
Expand Down
5 changes: 0 additions & 5 deletions tests/auto/jobs/bl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ def set_directories(job_obj):
blstore = '/lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/'
rtbldir = '/lfs4/HFIP/h-nems/emc.nemspara/RT_BASELINE/'\
f'emc.nemspara/FV3_RT/REGRESSION_TEST_{job_obj.compiler.upper()}'
elif job_obj.machine == 'gaea':
workdir = '/lustre/f2/pdata/ncep/emc.nemspara/autort/pr'
blstore = '/lustre/f2/pdata/ncep_shared/emc.nemspara/RT/NEMSfv3gfs'
rtbldir = '/lustre/f2/scratch/emc.nemspara/FV3_RT/'\
f'REGRESSION_TEST_{job_obj.compiler.upper()}'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
blstore = '/work/noaa/nems/emc.nemspara/RT/NEMSfv3gfs'
Expand Down
2 changes: 0 additions & 2 deletions tests/auto/jobs/rt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ def set_directories(job_obj):
workdir = '/scratch1/NCEPDEV/nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/h-nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'gaea':
workdir = '/lustre/f2/pdata/ncep/emc.nemspara/autort/pr'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'derecho':
Expand Down
3 changes: 0 additions & 3 deletions tests/auto/rt_auto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,6 @@ def setup_env():
elif bool(re.match(re.compile('fe.+'), hostname)):
machine = 'jet'
os.environ['ACCNR'] = 'h-nems'
elif bool(re.match(re.compile('gaea.+'), hostname)):
machine = 'gaea'
os.environ['ACCNR'] = 'nggps_emc'
elif bool(re.match(re.compile('Orion-login.+'), hostname)):
machine = 'orion'
elif bool(re.match(re.compile('chadmin.+'), hostname)):
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20231221
export BL_DATE=20240104
5 changes: 1 addition & 4 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,8 @@ set +x
if [[ $MACHINE_ID == macosx ]] || [[ $MACHINE_ID == linux ]]; then
source $PATHTR/modulefiles/ufs_${MACHINE_ID}.${RT_COMPILER}
else
# Activate lua environment for gaea c4
if [[ $MACHINE_ID == gaea ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init.sh
# Activate lua environment for gaea c5
elif [[ $MACHINE_ID == gaea-c5 ]]; then
if [[ $MACHINE_ID == gaea-c5 ]]; then
source /lustre/f2/dev/role.epic/contrib/Lmod_init_C5.sh
fi
# Load fv3 module
Expand Down
Loading