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

Update the libraries and gocart #1745

Merged
merged 40 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4e7b08d
add gridtype to gocart CAP.rc
junwang-noaa Mar 6, 2023
410f80a
move to GOCART 20230227 version with threading capability
junwang-noaa Mar 8, 2023
23b6951
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
junwang-noaa Mar 10, 2023
c74e487
update orion module files
junwang-noaa Mar 22, 2023
ecc08f3
Merge branch 'newmapl' of https://github.com/junwang-noaa/ufs-weather…
junwang-noaa Mar 22, 2023
5c67723
udpate to netcdf/4.9.2 and add threading capability for gocart
junwang-noaa Mar 31, 2023
f268c65
update libraries for hera/gaea/jet/cheyenne
junwang-noaa Mar 31, 2023
1b9c0f0
sync with the develop branch
junwang-noaa Apr 10, 2023
fb2d927
update esmf library
junwang-noaa Apr 26, 2023
abef1aa
sync to the develop branch
junwang-noaa Apr 26, 2023
c7f35bf
Merge remote-tracking branch 'upstream/develop' into newmapl
junwang-noaa May 9, 2023
b1a79d3
update GOCART to allow no-Nitrates run
junwang-noaa May 9, 2023
82c0da5
update libraries
junwang-noaa May 10, 2023
2b460fc
Merge remote-tracking branch 'upstream/develop' into newmapl
junwang-noaa May 10, 2023
bc67940
update jet/orion module file
junwang-noaa May 10, 2023
5060c21
sync to the develop branch
junwang-noaa May 31, 2023
43181f1
sync to the top of develop branch
junwang-noaa Jun 21, 2023
e07fa06
update gaea module
junwang-noaa Jun 21, 2023
c7153ff
update GOCART to v2.2.1
junwang-noaa Jul 3, 2023
0b32a62
Merge remote-tracking branch 'upstream/develop' into newmapl
junwang-noaa Jul 11, 2023
c544ce4
Merge remote-tracking branch 'upstream/develop' into newmapl
junwang-noaa Aug 2, 2023
012267c
update wcoss2 module file
junwang-noaa Aug 2, 2023
c10e595
Merge remote-tracking branch 'upstream/develop' into newmapl
junwang-noaa Aug 4, 2023
7aa2e96
Add new BL_DATE
jkbk2004 Aug 4, 2023
6470d09
fix hera machine in regional_aq test
junwang-noaa Aug 4, 2023
1af2024
Merge branch 'newmapl' of https://github.com/junwang-noaa/ufs-weather…
junwang-noaa Aug 4, 2023
264c083
fix hera machine in regional_aq test
junwang-noaa Aug 4, 2023
0389818
fix the compiler version on wcoss2 and acorn
junwang-noaa Aug 4, 2023
a48d988
add orion RT logs: passed
zach1221 Aug 5, 2023
2e92607
update cheyenne gnu module file
junwang-noaa Aug 5, 2023
bff0ac8
Merge branch 'newmapl' of https://github.com/junwang-noaa/ufs-weather…
junwang-noaa Aug 5, 2023
da2e24b
add hera RT log: passed
jkbk2004 Aug 5, 2023
e84a0da
gaea RT passed with increased nodes: regional_atmaq/faster
jkbk2004 Aug 5, 2023
acba73a
update TPN for regional atmaq on cheyenne
junwang-noaa Aug 7, 2023
50b2ed3
Merge branch 'newmapl' of https://github.com/junwang-noaa/ufs-weather…
junwang-noaa Aug 7, 2023
56cfef0
add jet RT log: passed
jkbk2004 Aug 7, 2023
49d7041
WCOSS2 RT Log
BrianCurtis-NOAA Aug 7, 2023
3a4806a
Update TPN in regional_atmaq for cheyenne
zach1221 Aug 7, 2023
c248c25
Update TPN to 16 for regional_atmaq_debug on cheyenne
zach1221 Aug 7, 2023
0d8fc91
Update TPN to 16 for regional_atmaq_faster on cheyenne
zach1221 Aug 7, 2023
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
2 changes: 1 addition & 1 deletion GOCART
Submodule GOCART updated 56 files
+2 −2 .circleci/config.yml
+29 −0 .github/workflows/enforce-labels.yml
+74 −1 CHANGELOG.md
+29 −17 ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc
+31 −19 ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc
+49 −62 ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
+101 −70 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridCompMod.F90
+31 −19 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc
+47 −60 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
+32 −31 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
+4 −1 ESMF/GOCART2G_GridComp/CA2G_GridComp/CMakeLists.txt
+5 −0 ESMF/GOCART2G_GridComp/CMakeLists.txt
+34 −74 ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.yaml
+5 −0 ESMF/GOCART2G_GridComp/DU2G_GridComp/CMakeLists.txt
+105 −78 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
+29 −29 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.rc
+34 −74 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.yaml
+1 −0 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
+5 −0 ESMF/GOCART2G_GridComp/GA_Environment/CMakeLists.txt
+215 −164 ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
+9 −3 ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
+3 −3 ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc
+4 −4 ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc
+7 −17 ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
+5 −0 ESMF/GOCART2G_GridComp/NI2G_GridComp/CMakeLists.txt
+136 −92 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90
+4 −4 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc
+6 −16 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
+12 −11 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
+34 −74 ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.yaml
+4 −1 ESMF/GOCART2G_GridComp/SS2G_GridComp/CMakeLists.txt
+84 −68 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90
+25 −25 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.rc
+34 −74 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.yaml
+8 −7 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc
+13 −13 ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc
+14 −14 ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc
+19 −52 ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
+5 −0 ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
+179 −142 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90
+14 −14 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc
+18 −51 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
+11 −9 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc
+1 −1 ESMF/GOCART_GridComp/CO_GridComp/AMIP/CO_GridComp_ExtData.rc
+3 −3 ESMF/GOCART_GridComp/CO_GridComp/AMIP/CO_GridComp_ExtData.yaml
+1 −1 ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.rc
+2 −2 ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.yaml
+1 −1 ESMF/GOCART_GridComp/GOCART_GridCompMod.F90
+1 −1 ESMF/GOCART_GridComp/O3_GridComp/AMIP.20C/O3_GridComp.rc
+1 −1 ESMF/GOCART_GridComp/O3_GridComp/AMIP/O3_GridComp.rc
+1 −1 ESMF/GOCART_GridComp/O3_GridComp/O3_GridComp.rc
+1 −1 ESMF/Shared/Chem_AeroGeneric.F90
+5 −0 Process_Library/CMakeLists.txt
+34 −24 Process_Library/GOCART2G_MieMod.F90
+82 −32 Process_Library/GOCART2G_Process.F90
+7 −6 components.yaml
2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ load(pathJoin("ncarcompilers", ncarcompilers_ver))

unload("netcdf")

prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu10.1.0/modulefiles/stack")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/gnu10.1.0_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_cheyenne.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ load(pathJoin("ncarcompilers", ncarcompilers_ver))

unload("netcdf")

prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1/modulefiles/stack")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/hpc-stack/intel2022.1_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
12 changes: 6 additions & 6 deletions modulefiles/ufs_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ local ufs_modules = {
{["jasper"] = "2.0.25"},
{["zlib"] = "1.2.11"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.10.6"},
{["netcdf"] = "4.7.4"},
{["pio"] = "2.5.7"},
{["esmf"] = "8.3.0b09"},
{["fms"] = "2022.04"},
{["hdf5"] = "1.14.0"},
{["netcdf"] = "4.9.2"},
{["pio"] = "2.5.10"},
{["esmf"] = "8.4.2"},
{["fms"] = "2023.01"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
Expand All @@ -19,7 +19,7 @@ local ufs_modules = {
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["gftl-shared"] = "v1.5.0"},
{["mapl"] = "2.22.0-esmf-8.3.0b09"},
{["mapl"] = "2.35.2-esmf-8.4.2"},
}

for i = 1, #ufs_modules do
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]=

load_any(pathJoin("cmake", os.getenv("cmake_ver") or "3.20.1"),"cmake")

prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2/modulefiles/stack")
prepend_path("MODULEPATH","/lustre/f2/dev/role.epic/contrib/hpc-stack/intel-classic-2022.0.2_ncdf492/modulefiles/stack")
load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))

load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2022.0.2"))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ load(pathJoin("cmake", cmake_ver))
gnu_ver=os.getenv("gnu_ver") or "9.2.0"
load(pathJoin("gnu", gnu_ver))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2/modulefiles/stack")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/gnu-9.2_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ load(pathJoin("intel", intel_ver))
impi_ver=os.getenv("impi_ver") or "2022.1.2"
load(pathJoin("impi", impi_ver))

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/hpc-stack/libs/intel-2022.1.2_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_jet.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ load("sutils")
cmake_ver=os.getenv("cmake_ver") or "3.20.1"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/hpc-stack/libs/intel-2022.1.2_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_orion.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ load("noaatools")
cmake_ver=os.getenv("cmake_ver") or "3.22.1"
load(pathJoin("cmake", cmake_ver))

prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2/modulefiles/stack")
prepend_path("MODULEPATH", "/work/noaa/epic-ps/role-epic-ps/hpc-stack/libs/intel-2022.1.2_ncdf492/modulefiles/stack")

hpc_ver=os.getenv("hpc_ver") or "1.2.0"
load(pathJoin("hpc", hpc_ver))
Expand Down
63 changes: 4 additions & 59 deletions modulefiles/ufs_wcoss2.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,71 +12,16 @@ load(pathJoin("intel", intel_ver))
craype_ver=os.getenv("craype_ver") or "2.7.13"
load(pathJoin("craype", craype_ver))

cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.7"
cray_mpich_ver=os.getenv("cray_mpich_ver") or "8.1.12"
load(pathJoin("cray-mpich", cray_mpich_ver))

cmake_ver=os.getenv("cmake_ver") or "3.20.2"
load(pathJoin("cmake", cmake_ver))

jasper_ver=os.getenv("jasper_ver") or "2.0.25"
load(pathJoin("jasper", jasper_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")

zlib_ver=os.getenv("zlib_ver") or "1.2.11"
load(pathJoin("zlib", zlib_ver))

libpng_ver=os.getenv("libpng_ver") or "1.6.37"
load(pathJoin("libpng", libpng_ver))

hdf5_ver=os.getenv("hdf5_ver") or "1.10.6"
load(pathJoin("hdf5", hdf5_ver))

netcdf_ver=os.getenv("netcdf_ver") or "4.7.4"
load(pathJoin("netcdf", netcdf_ver))

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

bacio_ver=os.getenv("bacio_ver") or "2.4.1"
load(pathJoin("bacio", bacio_ver))

crtm_ver=os.getenv("crtm_ver") or "2.4.0"
load(pathJoin("crtm", crtm_ver))

g2_ver=os.getenv("g2_ver") or "3.4.5"
load(pathJoin("g2", g2_ver))

g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
load(pathJoin("g2tmpl", g2tmpl_ver))

ip_ver=os.getenv("ip_ver") or "3.3.3"
load(pathJoin("ip", ip_ver))

sp_ver=os.getenv("sp_ver") or "2.3.3"
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))

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

mapl_ver=os.getenv("mapl_ver") or "2.23.1-esmf-8.3.0b09"
load(pathJoin("mapl", mapl_ver))
load("ufs_common")

setenv("CC", "cc")
setenv("CXX", "CC")
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export BL_DATE=20230728
export BL_DATE=20230804

Loading