Skip to content

Commit ff2f0af

Browse files
junwang-noaaBrianCurtis-NOAAjkbk2004
authored
update library and remove yaFyaml (ufs-community#1425)
* update crtm-2.4.0 library and remove yaFyaml * update GOCART Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com> Co-authored-by: Brian Curtis <brian.curtis@noaa.gov> Co-authored-by: jkbk2004 <jong.kim@noaa.gov>
1 parent 2b1284d commit ff2f0af

16 files changed

+2646
-2675
lines changed

GOCART

Submodule GOCART updated 38 files

modulefiles/ufs_common.lua

+1-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ load(pathJoin("fms",fms_ver))
2929
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
3030
load(pathJoin("bacio", bacio_ver))
3131

32-
crtm_ver=os.getenv("crtm_ver") or "2.3.0"
32+
crtm_ver=os.getenv("crtm_ver") or "2.4.0"
3333
load(pathJoin("crtm", crtm_ver))
3434

3535
g2_ver=os.getenv("g2_ver") or "3.4.5"
@@ -50,9 +50,6 @@ load(pathJoin("w3emc", w3emc_ver))
5050
gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
5151
load(pathJoin("gftl-shared", gftl_shared_ver))
5252

53-
yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
54-
load(pathJoin("yafyaml", yafyaml_ver))
55-
5653
mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
5754
load(pathJoin("mapl", mapl_ver))
5855

modulefiles/ufs_common_debug.lua

+1-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ load(pathJoin("fms",fms_ver))
2929
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
3030
load(pathJoin("bacio", bacio_ver))
3131

32-
crtm_ver=os.getenv("crtm_ver") or "2.3.0"
32+
crtm_ver=os.getenv("crtm_ver") or "2.4.0"
3333
load(pathJoin("crtm", crtm_ver))
3434

3535
g2_ver=os.getenv("g2_ver") or "3.4.5"
@@ -50,9 +50,6 @@ load(pathJoin("w3emc", w3emc_ver))
5050
gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
5151
load(pathJoin("gftl-shared", gftl_shared_ver))
5252

53-
yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
54-
load(pathJoin("yafyaml", yafyaml_ver))
55-
5653
mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
5754
load(pathJoin("mapl", mapl_ver))
5855

modulefiles/ufs_gaea.intel

+1-2
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,14 @@ module load esmf/8.3.0b09
4040
module load fms/2022.01
4141

4242
module load bacio/2.4.1
43-
module load crtm/2.3.0
43+
module load crtm/2.4.0
4444
module load g2/3.4.5
4545
module load g2tmpl/1.10.0
4646
module load ip/3.3.3
4747
module load sp/2.3.3
4848
module load w3emc/2.9.2
4949

5050
module load gftl-shared/v1.5.0
51-
module load yafyaml/v0.5.1
5251
module load mapl/2.22.0-esmf-8.3.0b09
5352

5453
setenv CC cc

modulefiles/ufs_gaea.intel_debug

+1-2
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,14 @@ module load esmf/8.3.0b09-debug
3737
module load fms/2022.01
3838

3939
module load bacio/2.4.1
40-
module load crtm/2.3.0
40+
module load crtm/2.4.0
4141
module load g2/3.4.5
4242
module load g2tmpl/1.10.0
4343
module load ip/3.3.3
4444
module load sp/2.3.3
4545
module load w3emc/2.9.2
4646

4747
module load gftl-shared/v1.5.0
48-
module load yafyaml/v0.5.1
4948
module load mapl/2.22.0-esmf-8.3.0b09
5049

5150
setenv CC cc

modulefiles/ufs_orion.intel.lua

-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ load(pathJoin("cmake", cmake_ver))
1111
python_ver=os.getenv("python_ver") or "3.7.5"
1212
load(pathJoin("python", python_ver))
1313

14-
--prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
1514
prepend_path("MODULEPATH", "/work/noaa/epic-ps/hpc-stack/libs/intel/2022.1.2/modulefiles/stack")
1615

17-
--hpc_ver=os.getenv("hpc_ver") or "1.1.0"
1816
hpc_ver=os.getenv("hpc_ver") or "1.2.0"
1917
load(pathJoin("hpc", hpc_ver))
2018

modulefiles/ufs_orion.intel_debug.lua

-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ load(pathJoin("python", python_ver))
1414
--prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
1515
prepend_path("MODULEPATH", "/work/noaa/epic-ps/hpc-stack/libs/intel/2022.1.2/modulefiles/stack")
1616

17-
--hpc_ver=os.getenv("hpc_ver") or "1.1.0"
1817
hpc_ver=os.getenv("hpc_ver") or "1.2.0"
1918
load(pathJoin("hpc", hpc_ver))
2019

modulefiles/ufs_wcoss2.intel.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ load(pathJoin("fms", fms_ver))
4848
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
4949
load(pathJoin("bacio", bacio_ver))
5050

51-
crtm_ver=os.getenv("crtm_ver") or "2.3.0"
51+
crtm_ver=os.getenv("crtm_ver") or "2.4.0"
5252
load(pathJoin("crtm", crtm_ver))
5353

5454
g2_ver=os.getenv("g2_ver") or "3.4.5"

modulefiles/ufs_wcoss2.intel_debug.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ load(pathJoin("fms", fms_ver))
4848
bacio_ver=os.getenv("bacio_ver") or "2.4.1"
4949
load(pathJoin("bacio", bacio_ver))
5050

51-
crtm_ver=os.getenv("crtm_ver") or "2.3.0"
51+
crtm_ver=os.getenv("crtm_ver") or "2.4.0"
5252
load(pathJoin("crtm", crtm_ver))
5353

5454
g2_ver=os.getenv("g2_ver") or "3.4.5"

tests/RegressionTests_cheyenne.gnu.log

+162-162
Large diffs are not rendered by default.

tests/RegressionTests_cheyenne.intel.log

+470-470
Large diffs are not rendered by default.

tests/RegressionTests_gaea.intel.log

+482-482
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)