Skip to content

Commit

Permalink
Merge branch 'NOAA-EMC:develop' into jenkins-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
FernandoAndrade-NOAA authored Oct 10, 2023
2 parents 6d41c41 + fae617b commit e6430af
Show file tree
Hide file tree
Showing 30 changed files with 17,345 additions and 399 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
58 changes: 58 additions & 0 deletions modulefiles/gaea-c5.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
help([[
This module loads libraries required for building and running UPP
on the NOAA RDHPC machine Gaea C5 using Intel-2023.1.0.
]])

whatis([===[Loads libraries needed for building the UPP on Gaea ]===])

load("PrgEnv-intel/8.3.3")
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-dev-20230717/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"
load(pathJoin("stack-intel", stack_intel_ver))

stack_cray_mpich_ver=os.getenv("stack_cray_mpich_ver") or "8.1.25"
load(pathJoin("stack-cray-mpich", stack_cray_mpich_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
load(pathJoin("stack-python", stack_python_ver))

local ufs_modules = {
{["jasper"] = "2.0.32"},
{["zlib"] = "1.2.13"},
{["libpng"] = "1.6.37"},
{["hdf5"] = "1.14.0"},
{["netcdf-c"] = "4.9.2"},
{["netcdf-fortran"] = "4.6.0"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["ip"] = "3.3.3"},
{["nemsio"] = "2.5.4"},
{["sfcio"] = "1.4.1"},
{["sigio"] = "2.3.2"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
{["wrf-io"] = "1.2.0"},
}

for i = 1, #ufs_modules do
for name, default_version in pairs(ufs_modules[i]) do
local env_version_name = string.gsub(name, "-", "_") .. "_ver"
load(pathJoin(name, os.getenv(env_version_name) or default_version))
end
end

unload("darshan-runtime")
unload("cray-libsci")

setenv("CC","cc")
setenv("CXX","CC")
setenv("FC","ftn")
setenv("CMAKE_Platform","gaea_c5.intel")
56 changes: 56 additions & 0 deletions modulefiles/gaea.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
help([[
This module loads libraries required for building and running UPP
on the NOAA RDHPC machine Gaea using Intel-2022.0.2
]])

whatis([===[Loads libraries needed for building the UPP 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")
load(pathJoin("hpc", os.getenv("hpc_ver") or "1.2.0"))

load(pathJoin("intel-classic", os.getenv("intel_classic_ver") or "2022.0.2"))
load(pathJoin("cray-mpich", os.getenv("cray_mpich_ver") or "7.7.20"))
load(pathJoin("hpc-intel-classic", os.getenv("hpc_intel_classic_ver") or "2022.0.2"))
load(pathJoin("hpc-cray-mpich", os.getenv("hpc_cray_mpich_ver") or "7.7.20"))
load(pathJoin("libpng", os.getenv("libpng_ver") or "1.6.37"))

-- Needed at runtime:
load("alps")

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"},
{["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.22.0-esmf-8.3.0b09"},
{["nemsio"] = "2.5.4"},
{["sigio"] = "2.3.2"},
{["sfcio"] = "1.4.1"},
{["wrf_io"] = "1.2.0"},
}

for i = 1, #ufs_modules do
for name, default_version in pairs(ufs_modules[i]) do
local env_version_name = string.gsub(name, "-", "_") .. "_ver"
load(pathJoin(name, os.getenv(env_version_name) or default_version))
end
end

setenv("CC","cc")
setenv("FC","ftn")
setenv("CXX","CC")
setenv("CMAKE_Platform","gaea.intel")
48 changes: 0 additions & 48 deletions parm/AEROSOL_LUTS.dat

This file was deleted.

181 changes: 172 additions & 9 deletions parm/fv3lam_rrfs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@
<param>
<shortname>ABSV_ON_ISOBARIC_SFC</shortname>
<pname>ABSV</pname>
<level>20000. 25000. 30000. 40000. 50000. 70000. 75000. 85000. 92500. 100000.</level>
<level>200. 500. 700. 1000. 2000. 3000. 5000. 7000. 10000. 12500. 15000. 17500. 20000. 22500. 25000. 27500. 30000. 32500. 35000. 37500. 40000. 42500. 45000.
47500. 50000. 52500. 55000. 57500. 60000. 62500. 65000. 67500. 70000. 72500. 75000. 77500. 80000. 82500. 85000. 87500. 90000. 92500. 95000. 97500. 100000.</level>
<scale>4.0</scale>
</param>

Expand Down Expand Up @@ -267,6 +268,34 @@
<scale>3.0</scale>
</param>

<param>
<shortname>MCONV_ON_ISOBARIC_SFC</shortname>
<pname>MCONV</pname>
<level>85000. 95000.</level>
<scale>3.0</scale>
</param>

<param>
<shortname>MCONV_ON_SPEC_PRES_ABOVE_GRND</shortname>
<pname>MCONV</pname>
<level>3000.</level>
<level2>0.</level2>
<scale>3.0</scale>
</param>

<param>
<shortname>MCONV_ON_ENTIRE_ATMOS</shortname>
<pname>MCONV</pname>
<scale>5.0</scale>
</param>

<param>
<shortname>GSD_RH_WRT_PRECIP_WATER_ON_ENTIRE_ATMOS</shortname>
<pname>RHPW</pname>
<table_info>NCEP</table_info>
<scale>-0.1</scale>
</param>

<param>
<shortname>MSLET_ON_MEAN_SEA_LVL</shortname>
<pname>MSLET</pname>
Expand Down Expand Up @@ -617,6 +646,13 @@
<scale>4.0</scale>
</param>

<param>
<shortname>CAPE_ON_0_3KM_ABOVE_GRND</shortname>
<level>0.</level>
<level2>3000.</level2>
<scale>4.0</scale>
</param>

<param>
<shortname>CIN_ON_SURFACE</shortname>
<pname>CIN</pname>
Expand Down Expand Up @@ -660,6 +696,21 @@
<scale>4.0</scale>
</param>

<param>
<shortname>EFF_HLCY_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
<pname>EFHL</pname>
<fixed_sfc1_type>surface</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<shortname>CRITICAL_ANGLE</shortname>
<pname>CANGLE</pname>
<level>0.</level>
<level2>500.</level2>
<scale>3.0</scale>
</param>

<param>
<shortname>USTM_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
<pname>USTM</pname>
Expand Down Expand Up @@ -843,6 +894,12 @@
<scale>3.0</scale>
</param>

<param>
<shortname>TCDC_ON_BOUND_LYR</shortname>
<pname>TCDC</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>INST_TCDC_ON_ENTIRE_ATMOS</shortname>
<pname>TCDC</pname>
Expand Down Expand Up @@ -1134,6 +1191,18 @@
<scale>3.0</scale>
</param>

<param>
<shortname>VUCSH_ON_SPEC_HGT_LVL_ABOVE_GRND_0-1km</shortname>
<pname>VUCSH</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>VVCSH_ON_SPEC_HGT_LVL_ABOVE_GRND_0-1km</shortname>
<pname>VVCSH</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>VUCSH_ON_SPEC_HGT_LVL_ABOVE_GRND_0-6km</shortname>
<pname>VUCSH</pname>
Expand Down Expand Up @@ -1227,6 +1296,24 @@
<scale>6.0</scale>
</param>

<param>
<shortname>RH_ON_HGHST_TROP_FRZ_LVL</shortname>
<pname>RH</pname>
<scale>-0.1</scale>
</param>

<param>
<shortname>HGT_ON_HGHST_TROP_-20C_LVL</shortname>
<pname>HGT</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>HGT_ON_EQUIL_LVL</shortname>
<pname>HGT</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>HGT_ON_LWST_LVL_OF_WET_BULB_ZERO</shortname>
<pname>HGT</pname>
Expand Down Expand Up @@ -1923,6 +2010,37 @@
<scale>5.0</scale>
</param>

<param>
<shortname>DENDRITIC_LAYER_DEPTH</shortname>
<pname>LAYTH</pname>
<table_info>NCEP</table_info>
<fixed_sfc1_type>isothermal</fixed_sfc1_type>
<level>261.</level>
<fixed_sfc2_type>isothermal</fixed_sfc2_type>
<level2>256.</level2>
<scale>4.0</scale>
</param>

<param>
<shortname>GSD_DEPR_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<scale>-4.0</scale>
</param>

<param>
<shortname>GSD_POT_ON_SPEC_HGT_LVL_ABOVE_GRND_2m</shortname>
<scale>-4.0</scale>
</param>

<param>
<shortname>GSD_PRES_ON_0C_ISOTHERM</shortname>
<scale>3.0</scale>
</param>

<param>
<shortname>GSD_PRES_ON_HGHST_TROP_FRZ_LVL</shortname>
<scale>3.0</scale>
</param>

</paramset>

<paramset>
Expand Down Expand Up @@ -2080,6 +2198,13 @@
<scale>3.0</scale>
</param>

<param>
<shortname>GSD_RH_WRT_PRECIP_WATER_ON_ENTIRE_ATMOS</shortname>
<pname>RHPW</pname>
<table_info>NCEP</table_info>
<scale>-0.1</scale>
</param>

<param>
<shortname>MSLET_ON_MEAN_SEA_LVL</shortname>
<pname>MSLET</pname>
Expand Down Expand Up @@ -2599,6 +2724,12 @@
<scale>3.0</scale>
</param>

<param>
<shortname>TCDC_ON_BOUND_LYR</shortname>
<pname>TCDC</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>INST_TCDC_ON_ENTIRE_ATMOS</shortname>
<pname>TCDC</pname>
Expand Down Expand Up @@ -2968,6 +3099,13 @@
<scale>4.0</scale>
</param>

<param>
<shortname>CAPE_ON_0_3KM_ABOVE_GRND</shortname>
<level>0.</level>
<level2>3000.</level2>
<scale>4.0</scale>
</param>

<param>
<shortname>CIN_ON_SURFACE</shortname>
<pname>CIN</pname>
Expand Down Expand Up @@ -3014,6 +3152,21 @@
<scale>4.0</scale>
</param>

<param>
<shortname>EFF_HLCY_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
<pname>EFHL</pname>
<fixed_sfc1_type>surface</fixed_sfc1_type>
<scale>3.0</scale>
</param>

<param>
<shortname>CRITICAL_ANGLE</shortname>
<pname>CANGLE</pname>
<level>0.</level>
<level2>500.</level2>
<scale>3.0</scale>
</param>

<param>
<shortname>USTM_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
<pname>USTM</pname>
Expand Down Expand Up @@ -3187,6 +3340,24 @@
<scale>6.0</scale>
</param>

<param>
<shortname>RH_ON_HGHST_TROP_FRZ_LVL</shortname>
<pname>RH</pname>
<scale>-0.1</scale>
</param>

<param>
<shortname>HGT_ON_HGHST_TROP_-20C_LVL</shortname>
<pname>HGT</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>HGT_ON_EQUIL_LVL</shortname>
<pname>HGT</pname>
<scale>3.0</scale>
</param>

<param>
<shortname>PRES_ON_MAX_WIND</shortname>
<pname>PRES</pname>
Expand Down Expand Up @@ -3639,14 +3810,6 @@
<level>5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.</level>
</param>

<param>
<shortname>ICE_SEV_CAT_IFI_FLIGHT_LEVEL</shortname>
<scale>4.0</scale>
<!-- Level units are in 0.1 feet, so final output will be in units of 0.1 meters -->
<scale_fact_fixed_sfc1>1</scale_fact_fixed_sfc1>
<level>5000. 10000. 15000. 20000. 25000. 30000. 35000. 40000. 45000. 50000. 55000. 60000. 65000. 70000. 75000. 80000. 85000. 90000. 95000. 100000. 105000. 110000. 115000. 120000. 125000. 130000. 135000. 140000. 145000. 150000. 155000. 160000. 165000. 170000. 175000. 180000. 185000. 190000. 195000. 200000. 205000. 210000. 215000. 220000. 225000. 230000. 235000. 240000. 245000. 250000. 255000. 260000. 265000. 270000. 275000. 280000. 285000. 290000. 295000. 300000.</level>
</param>

<param>
<shortname>WMO_ICE_SEV_CAT_IFI_FLIGHT_LEVEL</shortname>
<scale>4.0</scale>
Expand Down
Loading

0 comments on commit e6430af

Please sign in to comment.