Skip to content

update library and remove yaFyaml #1425

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

Merged
jkbk2004 merged 12 commits into from
Sep 29, 2022
Merged

update library and remove yaFyaml #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
26d3ff7
update library and remove yaFyaml
junwang-noaa Sep 15, 2022
d8be979
update GOCART and fms lib
junwang-noaa Sep 26, 2022
82f7fda
merge to top of develop branch
junwang-noaa Sep 26, 2022
bd4b710
change fms back to 2022.01
junwang-noaa Sep 26, 2022
2ff6f59
[AutoRT] hera.gnu Job Completed.
BrianCurtis-NOAA Sep 26, 2022
fbfb264
change g2tmpl back to 1.10.0
junwang-noaa Sep 27, 2022
5bd9671
Merge branch 'lib_update' of https://github.com/junwang-noaa/ufs-weat…
junwang-noaa Sep 27, 2022
c3a461c
add hera intel/gnu RT logs: passed
jkbk2004 Sep 28, 2022
d641e96
WCOSS2 RT Log
BrianCurtis-NOAA Sep 28, 2022
0f25fff
[AutoRT] gaea.intel Job Completed.
BrianCurtis-NOAA Sep 28, 2022
0b4d6c3
add jet.intel RT log: passed
jkbk2004 Sep 29, 2022
8b0d840
add cheyenne intel/gnu RT logs: passed
jkbk2004 Sep 29, 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
2 changes: 1 addition & 1 deletion GOCART
Open in desktop
Submodule GOCART updated 38 files
+36 −46 .circleci/config.yml
+1 −1 .github/workflows/changelog-enforcer.yml
+31 −0 .github/workflows/validate_yaml_files.yml
+29 −0 .yamllint.yml
+31 −3 CHANGELOG.md
+2 −6 CMakeLists.txt
+27 −0 ESMF/Apps/CMakeLists.txt
+64 −354 ESMF/Apps/GOCART2G_AopMod.F90
+323 −0 ESMF/Apps/GOCART2G_SimpleBundleMod.F90
+144 −70 ESMF/Apps/aop_calculator.F90
+128 −0 ESMF/Apps/aop_calculator.py
+60 −0 ESMF/Apps/aop_calculator.rc
+1 −0 ESMF/CMakeLists.txt
+25 −1 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridCompMod.F90
+31 −27 ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
+31 −2 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
+37 −33 ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
+1 −1 ESMF/GOCART2G_GridComp/GA_Environment/CMakeLists.txt
+135 −5 ESMF/GOCART2G_GridComp/GOCART2G_GridCompMod.F90
+23 −17 ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
+1 −1 ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
+31 −3 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridCompMod.F90
+1 −1 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
+54 −50 ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
+28 −1 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridCompMod.F90
+32 −28 ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc
+3 −3 ESMF/GOCART2G_GridComp/SU2G_GridComp/CMakeLists.txt
+29 −0 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridCompMod.F90
+48 −44 ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc
+2 −2 ESMF/GOCART_GridComp/CO2_GridComp/AMIP/CO2_GridComp_ExtData.yaml
+2 −2 ESMF/GOCART_GridComp/CO2_GridComp/CO2_GridComp_ExtData.yaml
+1 −1 ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.yaml
+0 −2 ESMF/GOCART_GridComp/GOCART_GridCompMod.F90
+3 −3 ESMF/Shared/CMakeLists.txt
+0 −2 ESMF/UFS/Aerosol_Internal_Mod.F90
+10 −7 Process_Library/GOCART2G_MieMod.F90
+63 −60 Process_Library/GOCART2G_Process.F90
+4 −4 components.yaml
5 changes: 1 addition & 4 deletions modulefiles/ufs_common.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ 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.3.0"
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"
Expand All @@ -50,9 +50,6 @@ load(pathJoin("w3emc", w3emc_ver))
gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
load(pathJoin("gftl-shared", gftl_shared_ver))

yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
load(pathJoin("yafyaml", yafyaml_ver))

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

Expand Down
5 changes: 1 addition & 4 deletions modulefiles/ufs_common_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ 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.3.0"
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"
Expand All @@ -50,9 +50,6 @@ load(pathJoin("w3emc", w3emc_ver))
gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
load(pathJoin("gftl-shared", gftl_shared_ver))

yafyaml_ver=os.getenv("yafyaml_ver") or "v0.5.1"
load(pathJoin("yafyaml", yafyaml_ver))

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

Expand Down
3 changes: 1 addition & 2 deletions modulefiles/ufs_gaea.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ module load esmf/8.3.0b09
module load fms/2022.01

module load bacio/2.4.1
module load crtm/2.3.0
module load crtm/2.4.0
module load g2/3.4.5
module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3emc/2.9.2

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

setenv CC cc
Expand Down
3 changes: 1 addition & 2 deletions modulefiles/ufs_gaea.intel_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,14 @@ module load esmf/8.3.0b09-debug
module load fms/2022.01

module load bacio/2.4.1
module load crtm/2.3.0
module load crtm/2.4.0
module load g2/3.4.5
module load g2tmpl/1.10.0
module load ip/3.3.3
module load sp/2.3.3
module load w3emc/2.9.2

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

setenv CC cc
Expand Down
2 changes: 0 additions & 2 deletions modulefiles/ufs_orion.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ load(pathJoin("cmake", cmake_ver))
python_ver=os.getenv("python_ver") or "3.7.5"
load(pathJoin("python", python_ver))

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

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

Expand Down
1 change: 0 additions & 1 deletion modulefiles/ufs_orion.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ load(pathJoin("python", python_ver))
--prepend_path("MODULEPATH", "/apps/contrib/NCEP/libs/hpc-stack/modulefiles/stack")
prepend_path("MODULEPATH", "/work/noaa/epic-ps/hpc-stack/libs/intel/2022.1.2/modulefiles/stack")

--hpc_ver=os.getenv("hpc_ver") or "1.1.0"
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_wcoss2.intel.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ 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.3.0"
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"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_wcoss2.intel_debug.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ 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.3.0"
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"
Expand Down
324 changes: 162 additions & 162 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

940 changes: 470 additions & 470 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

964 changes: 482 additions & 482 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

Loading