forked from ufs-community/ufs-weather-model
-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #98 from grantfirl/ufs-dev-PR26
UFS-dev PR#26
- Loading branch information
Showing
59 changed files
with
4,122 additions
and
3,862 deletions.
There are no files selected for viewing
Submodule CMEPS
updated
2 files
+26 −5 | ufs/ccpp/data/MED_typedefs.F90 | |
+52 −6 | ufs/ccpp/data/MED_typedefs.meta |
Submodule FV3
updated
15 files
+1 −0 | CMakeLists.txt | |
+1 −0 | ccpp/config/ccpp_prebuild_config.py | |
+0 −3 | ccpp/data/CCPP_typedefs.F90 | |
+0 −6 | ccpp/data/CCPP_typedefs.meta | |
+250 −16 | ccpp/data/GFS_typedefs.F90 | |
+431 −4 | ccpp/data/GFS_typedefs.meta | |
+387 −0 | ccpp/driver/GFS_diagnostics.F90 | |
+28 −0 | ccpp/driver/GFS_restart.F90 | |
+1 −1 | ccpp/physics | |
+95 −0 | ccpp/suites/suite_FV3_GFS_v16_clm_lake.xml | |
+1 −1 | ccpp/suites/suite_FV3_HRRR.xml | |
+82 −0 | ccpp/suites/suite_FV3_HRRR_flake.xml | |
+91 −0 | ccpp/suites/suite_FV3_RAP_clm_lake.xml | |
+166 −16 | io/FV3GFS_io.F90 | |
+432 −0 | io/clm_lake_io.F90 |
Submodule WW3
updated
4 files
+3 −0 | .gitignore | |
+27 −27 | model/src/w3gridmd.F90 | |
+2 −1 | model/src/w3iogrmd.F90 | |
+8 −8 | model/src/w3profsmd_pdlib.F90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,56 +1,30 @@ | ||
help([[ | ||
loads UFS Model common libraries | ||
]]) | ||
|
||
jasper_ver=os.getenv("jasper_ver") or "2.0.25" | ||
load(pathJoin("jasper", jasper_ver)) | ||
|
||
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)) | ||
|
||
pio_ver=os.getenv("pio_ver") or "2.5.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.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)) | ||
|
||
gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0" | ||
load(pathJoin("gftl-shared", gftl_shared_ver)) | ||
|
||
mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09" | ||
load(pathJoin("mapl", mapl_ver)) | ||
|
||
whatis("Description: UFS build environment common libraries") | ||
|
||
help([[Load UFS Model common libraries]]) | ||
|
||
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"}, | ||
} | ||
|
||
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.