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.

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

Auto PR - main → MAPL-v3 - Update to ESMA_env v4.29.0, ESMA_cmake v3.46.0 #870

Merged
merged 17 commits into from
Jan 16, 2025
Merged

Auto PR - main → MAPL-v3 - Update to ESMA_env v4.29.0, ESMA_cmake v3.46.0 #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4d5f78c
Update to ESMA_env v4.30.1
mathomp4 Sep 9, 2024
9874796
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Sep 9, 2024
2dd5c16
Update to ESMA_env v4.31.1
mathomp4 Sep 18, 2024
e48f885
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Sep 30, 2024
8cffd41
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Oct 22, 2024
36a259d
Update to Baselibs 7.27.0
mathomp4 Oct 22, 2024
2000b10
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Oct 30, 2024
4c6a243
Update to ESMA_cmake v3.54.0
mathomp4 Nov 13, 2024
a27b917
Update to ESMA_cmake v3.55.0
mathomp4 Dec 2, 2024
eb2ef90
Update cmake minimum version to 3.24
mathomp4 Dec 2, 2024
d467d8c
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Dec 6, 2024
f87b5fd
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Jan 6, 2025
f8d7c96
v11: Update to ESMA_env v4.33.0
mathomp4 Jan 6, 2025
dfbc3e1
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
mathomp4 Jan 16, 2025
1069d0c
Update to ESMA_env v4.34.0
mathomp4 Jan 16, 2025
ecd484e
Merge branch 'main' into feature/mathomp4/update-to-baselibs-7.25-gcm
sdrabenh Jan 16, 2025
816c2d6
Merge pull request #804 from GEOS-ESM/feature/mathomp4/update-to-base…
sdrabenh Jan 16, 2025
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
| [CPLFCST_Etc](https://github.com/GEOS-ESM/CPLFCST_Etc) | [v1.0.1](https://github.com/GEOS-ESM/CPLFCST_Etc/releases/tag/v1.0.1) |
| [ecbuild](https://github.com/GEOS-ESM/ecbuild) | [geos/v1.4.0](https://github.com/GEOS-ESM/ecbuild/releases/tag/geos%2Fv1.4.0) |
| [ESMA_cmake](https://github.com/GEOS-ESM/ESMA_cmake) | [v3.56.0](https://github.com/GEOS-ESM/ESMA_cmake/releases/tag/v3.56.0) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.29.2](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.29.2) |
| [ESMA_env](https://github.com/GEOS-ESM/ESMA_env) | [v4.34.0](https://github.com/GEOS-ESM/ESMA_env/releases/tag/v4.34.0) |
| [FMS](https://github.com/GEOS-ESM/FMS) | [geos/2019.01.02+noaff.10](https://github.com/GEOS-ESM/FMS/releases/tag/geos%2F2019.01.02%2Bnoaff.10) |
| [FVdycoreCubed_GridComp](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp) | [v2.13.0](https://github.com/GEOS-ESM/FVdycoreCubed_GridComp/releases/tag/v2.13.0) |
| [geos-chem](https://github.com/GEOS-ESM/geos-chem) | [geos/v13.0.0-rc1](https://github.com/GEOS-ESM/geos-chem/releases/tag/geos%2Fv13.0.0-rc1) |
Expand Down
2 changes: 1 addition & 1 deletion components.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ GEOSgcm:
env:
local: ./@env
remote: ../ESMA_env.git
tag: v4.29.2
tag: v4.34.0
develop: main

cmake:
Expand Down
5 changes: 3 additions & 2 deletions parallel_build.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,21 @@ if (-d ${ESMADIR}/@env || -d ${ESMADIR}/env@ || -d ${ESMADIR}/env) then
echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util"
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
endif
mepo status
else
if ($?PBS_JOBID || $?SLURM_JOBID) then
echo " mepo clone must be run!"
echo " This requires internet access but you are on a compute node"
echo " Please run from a head node"
exit 1
else
echo "Running mepo initialization"
mepo init
echo "Running mepo clone"
mepo clone
if ( "$DEVELOP" == "TRUE" ) then
echo "Checking out development branches of GEOSgcm_GridComp, GEOSgcm_App, GMAO_Shared, and GEOS_Util"
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
endif
mepo status
endif
endif

Expand Down
Loading