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.

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

update fms to fms/2022.04 and add a coupled mixed-mode test #1514

Merged
merged 49 commits into from
Dec 12, 2022
Merged

update fms to fms/2022.04 and add a coupled mixed-mode test #1514

Show file tree
Hide file tree
Changes from 48 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
01fb72d
Update Jenkinsfile
zach1221 Oct 26, 2022
263a0ca
Update opnReqTest
zach1221 Oct 27, 2022
cc7ac7f
Update Jenkinsfile
zach1221 Oct 27, 2022
6d3b0f5
Update ci.test
zach1221 Oct 27, 2022
57da6f9
Update ci.test
zach1221 Oct 27, 2022
f47ae12
Update Jenkinsfile
zach1221 Oct 28, 2022
7cb5e5b
Update ci.test
zach1221 Oct 28, 2022
698ff99
Update opnReqTest
zach1221 Oct 28, 2022
92454ae
Update opnReqTest
zach1221 Oct 28, 2022
0bfe3bf
Update ci.test
zach1221 Oct 28, 2022
3720739
Merge branch 'ufs-community:develop' into develop
zach1221 Nov 16, 2022
c2b2b3a
Update Jenkinsfile
zach1221 Nov 16, 2022
4afcb5f
Merge branch 'ufs-community:develop' into develop
zach1221 Nov 17, 2022
051916e
Update ci.test
zach1221 Nov 17, 2022
ab0494e
Update ci.test
zach1221 Nov 17, 2022
fe0359f
Merge branch 'ufs-community:develop' into develop
zach1221 Nov 21, 2022
0731256
Update ci.test
zach1221 Nov 21, 2022
4847c73
Update Jenkinsfile
zach1221 Nov 21, 2022
50d77c7
update fv3 and add a test
binli2337 Dec 2, 2022
316bc8b
add a mixed-mode test
binli2337 Dec 2, 2022
5c71338
update rt.conf
binli2337 Dec 2, 2022
fb114cc
Merge branch 'develop' into test/update_fms
binli2337 Dec 5, 2022
301dec6
Merge branch 'ufs-community:develop' into develop
zach1221 Dec 5, 2022
c42a992
Update ci.test
zach1221 Dec 5, 2022
337f0f5
Update Jenkinsfile
zach1221 Dec 5, 2022
1bb728a
Merge branch 'develop' into test/update_fms
binli2337 Dec 6, 2022
2be82b4
Merge branch 'ufs-community:develop' into develop
zach1221 Dec 7, 2022
7643c50
Update ci.test
zach1221 Dec 7, 2022
91275c2
Update Jenkinsfile
zach1221 Dec 7, 2022
6e66216
Merge branch 'ufs-community:develop' into jenkins-ci_debug
zach1221 Dec 8, 2022
a3fb827
Update ci.test
zach1221 Dec 8, 2022
427d2b5
Update Jenkinsfile
zach1221 Dec 8, 2022
5b8c33f
update FV3
binli2337 Dec 9, 2022
bd3d26f
Merge branch 'develop' into test/update_fms
binli2337 Dec 9, 2022
948ede1
add new BL_DATE
jkbk2004 Dec 9, 2022
f4adacc
Update opnReqTest
zach1221 Dec 9, 2022
4ad0ef4
update FMS to 2022.04 on wcoss2.intel
aerorahul Dec 9, 2022
dcbfe53
add OpnReqTests_cpld_control_p8_mixedmode_hera.intel.log
binli2337 Dec 9, 2022
b3d0614
Merge remote-tracking branch 'remotes/update_ci/jenkins-ci_debug' int…
binli2337 Dec 9, 2022
242ffc3
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Dec 9, 2022
7637bc1
[AutoRT] hera.intel Job Completed.
BrianCurtis-NOAA Dec 9, 2022
1f01561
Update WCOSS2 fms location to fix cmake issue (from @aerorahul)
BrianCurtis-NOAA Dec 9, 2022
050380e
Make same edits to debug lua modulefile for WCOSS2
BrianCurtis-NOAA Dec 9, 2022
f52bc76
add orion.intel RT log: passed
jkbk2004 Dec 10, 2022
0c218d9
add cheyenne intel/gnu RT logs: passed
jkbk2004 Dec 10, 2022
ce9fd18
add gaea.intel RT log: passed
jkbk2004 Dec 10, 2022
9b8790f
add jet.intel RT log: passed
jkbk2004 Dec 10, 2022
0762f6f
WCOSS2 Intel RT Log
BrianCurtis-NOAA Dec 12, 2022
35bcd4c
revert .gitmodules
binli2337 Dec 12, 2022
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/binli2337/fv3atm
branch = test/update_fms
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
16 changes: 12 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/CMakeModules/Modules)
###############################################################################

# Valid applications and choices
list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS)
list(APPEND VALID_APPS ATM ATMAERO ATMAQ ATMW ATML LND S2S S2SA S2SW S2SWA S2SWAL HAFS HAFSW HAFS-ALL NG-GODAS MS2SWA)
set(APP NONE CACHE BOOL "Application Name")
if(NOT (APP IN_LIST VALID_APPS))
message(FATAL_ERROR "${APP} is not a valid application.\nValid Applications are: ${VALID_APPS}")
Expand Down Expand Up @@ -121,13 +121,21 @@ endif()
find_package(NetCDF 4.7.4 REQUIRED C Fortran)
find_package(ESMF 8.3.0 MODULE REQUIRED)
if(FMS)
find_package(FMS 2022.01 REQUIRED COMPONENTS R4 R8)
if(32BIT)
find_package(FMS 2022.04 REQUIRED COMPONENTS R4 R8)
if(APP MATCHES "^(HAFSW)$")
add_library(fms ALIAS FMS::fms_r4)
else()
elseif (APP MATCHES "^(MS2SWA)$")
add_library(fms ALIAS FMS::fms_r8)
endif()
if(APP MATCHES "^(ATM|ATMAERO|ATMAQ|ATMW|ATML|LND|S2S|S2SA|S2SW|S2SWA|S2SWAL|HAFS|HAFS-ALL|NG-GODAS)$")
if(32BIT)
add_library(fms ALIAS FMS::fms_r4)
else()
add_library(fms ALIAS FMS::fms_r8)
endif()
endif()
endif()

if(CMEPS)
find_package(PIO 2.5.3 REQUIRED COMPONENTS C Fortran STATIC)
endif()
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+4 −2 .gitmodules
+1 −1 atmos_cubed_sphere
6 changes: 3 additions & 3 deletions cmake/configure_apps.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,19 @@ if(APP MATCHES "^(NG-GODAS)$")
message("Configuring UFS app in (CDEPS) Data Atmosphere mode")
endif()

if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL)$")
if(APP MATCHES "^(S2S|S2SA|S2SW|S2SWA|S2SWAL|MS2SWA)$")
set(APP_MSG "Configuring UFS app in S2S")
set(CMEPS ON CACHE BOOL "Enable CMEPS" FORCE)
set(FMS ON CACHE BOOL "Enable FMS" FORCE)
set(FV3 ON CACHE BOOL "Enable FV3" FORCE)
set(MOM6 ON CACHE BOOL "Enable MOM6" FORCE)
set(CICE6 ON CACHE BOOL "Enable CICE6" FORCE)
set(STOCH_PHYS ON CACHE BOOL "Enable Stochastic Physics" FORCE)
if(APP MATCHES "^(S2SW|S2SWA|S2SWAL)")
if(APP MATCHES "^(S2SW|S2SWA|S2SWAL|MS2SWA)")
set(WW3 ON CACHE BOOL "Enable WAVEWATCH III" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Waves")
endif()
if(APP MATCHES "^(S2SA|S2SWA)")
if(APP MATCHES "^(S2SA|S2SWA|MS2SWA)")
set(UFS_GOCART ON CACHE BOOL "Enable GOCART" FORCE)
string(CONCAT APP_MSG ${APP_MSG} " with Aerosols")
endif()
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ load(pathJoin("pio", pio_ver))
esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
load(pathJoin("esmf", esmf_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms",fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_common_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ load(pathJoin("pio", pio_ver))
esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
load(pathJoin("esmf", esmf_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms",fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.7
module load esmf/8.3.0b09
module load fms/2022.01
module load fms/2022.04

module load bacio/2.4.1
module load crtm/2.4.0
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module load hdf5/1.10.6
module load netcdf/4.7.4
module load pio/2.5.7
module load esmf/8.3.0b09-debug
module load fms/2022.01
module load fms/2022.04

module load bacio/2.4.1
module load crtm/2.4.0
Expand Down
22 changes: 12 additions & 10 deletions modulefiles/ufs_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ help([[
loads UFS Model prerequisites on Cactus and Dogwood
]])

-- First, look for libraries in "prod" space
PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))

Expand All @@ -17,10 +18,6 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_ver))

Expand All @@ -36,10 +33,7 @@ load(pathJoin("hdf5", hdf5_ver))
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms", fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand All @@ -63,13 +57,21 @@ load(pathJoin("sp", sp_ver))
w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("w3emc", w3emc_ver))

-- Second, look for libraries in "para"
setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

-- Finally, look for libraries in "dev" space
prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0"
load(pathJoin("gftl_shared", gftl_shared_ver))

prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
load(pathJoin("esmf", esmf_ver))

Expand Down
22 changes: 12 additions & 10 deletions modulefiles/ufs_wcoss2.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ help([[
loads UFS Model prerequisites on Cactus and Dogwood
]])

-- First, look for libraries on "prod" space
PrgEnv_intel_ver=os.getenv("PrgEnv_intel_ver") or "8.1.0"
load(pathJoin("PrgEnv-intel", PrgEnv_intel_ver))

Expand All @@ -17,10 +18,6 @@ load(pathJoin("cray-mpich", cray_mpich_ver))
cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_ver))

Expand All @@ -36,10 +33,7 @@ load(pathJoin("hdf5", hdf5_ver))
netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

fms_ver=os.getenv("fms_ver") or "2022.01"
fms_ver=os.getenv("fms_ver") or "2022.04"
load(pathJoin("fms", fms_ver))

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
Expand All @@ -63,13 +57,21 @@ load(pathJoin("sp", sp_ver))
w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
load(pathJoin("w3emc", w3emc_ver))

-- Seond, look for libraries in "para"
setenv("HPC_OPT", "/apps/ops/para/libs")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/compiler/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/ops/para/libs/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.7")

pio_ver=os.getenv("pio_ver") or "2.5.7"
load(pathJoin("pio", pio_ver))

-- Finally, look for libraries in "dev" space
prepend_path("MODULEPATH", "/apps/dev/lmodules/intel/19.1.3.304")
prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

gftl_shared_ver=os.getenv("gftl_shared_ver") or "1.5.0"
load(pathJoin("gftl_shared", gftl_shared_ver))

prepend_path("MODULEPATH", "/apps/dev/modulefiles/mpi/intel/19.1.3.304/cray-mpich/8.1.9")

esmf_ver=os.getenv("esmf_ver") or "8.3.0b09-debug"
load(pathJoin("esmf", esmf_ver))

Expand Down
Loading