Skip to content

Porting GWD to mapl3 #1081

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
pchakraborty merged 15 commits into from
May 23, 2025
Merged

Porting GWD to mapl3 #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ad2bbbd
Added SetServices outside the module. Replaced 'use MAPL' with 'use M…
pchakraborty Mar 19, 2025
058161e
Switched to MAPL3's GridCompSetEntryPoint
pchakraborty Mar 19, 2025
f2ebf10
Removed comments left over from previous commit
pchakraborty Mar 19, 2025
bd57f50
Getting there. Builds
pchakraborty Mar 20, 2025
aa341b5
Using MAPL3's MAPL_GridCompGetInternalState and MAPL_GridCompGetResource
pchakraborty Mar 24, 2025
005f69e
Using MAPL_GridCompAddFieldSpec. Builds
pchakraborty Mar 25, 2025
fd4020e
Almost working - now crashing deep inside GWD (in pregeo with a float…
pchakraborty Mar 30, 2025
c036c93
Using MAPL_GridCompGet to access grid and num_levels
pchakraborty Apr 4, 2025
82c5594
Using MAPL_GridGet from mapl3g_Geom_API
pchakraborty Apr 10, 2025
7f09839
Removed some commented out lines
pchakraborty Apr 10, 2025
6049b8c
Use MAPL3's MAPL_StateGetPointer instead
pchakraborty Apr 28, 2025
6a01260
Using new array notion - (/16/) -> [16]
pchakraborty Apr 28, 2025
606605c
Merge branch 'release/MAPL-v3' into feature/pchakrab/gwd-to-mapl3
pchakraborty May 20, 2025
440aa6a
Workaround for memory corruption
pchakraborty May 23, 2025
7358335
Fix up CI
mathomp4 May 23, 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
62 changes: 32 additions & 30 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: 2.1

# Anchors in case we need to override the defaults from the orb
#baselibs_version: &baselibs_version v7.27.0
#baselibs_version: &baselibs_version v7.33.0
#bcs_version: &bcs_version v11.6.0

orbs:
Expand All @@ -25,32 +25,34 @@ workflows:
checkout_mapl3_release_branch: true
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra

# Run AMIP GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [gfortran, ifort]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
#baselibs_version: *baselibs_version
#bcs_version: *bcs_version

# Run Coupled GCM (1 hour, no ExtData)
- ci/run_gcm:
name: run-coupled-GCM-on-<< matrix.compiler >>
context:
- docker-hub-creds
matrix:
parameters:
compiler: [ifort]
requires:
- build-GEOSgcm-on-<< matrix.compiler >>
repo: GEOSgcm
#baselibs_version: *baselibs_version
#bcs_version: *bcs_version
gcm_ocean_type: MOM6
change_layout: false
######################################################
# # Run AMIP GCM (1 hour, no ExtData) #
# - ci/run_gcm: #
# name: run-GCM-on-<< matrix.compiler >> #
# context: #
# - docker-hub-creds #
# matrix: #
# parameters: #
# compiler: [gfortran, ifort] #
# requires: #
# - build-GEOSgcm-on-<< matrix.compiler >> #
# repo: GEOSgcm #
# #baselibs_version: *baselibs_version #
# #bcs_version: *bcs_version #
# #
# # Run Coupled GCM (1 hour, no ExtData) #
# - ci/run_gcm: #
# name: run-coupled-GCM-on-<< matrix.compiler >> #
# context: #
# - docker-hub-creds #
# matrix: #
# parameters: #
# compiler: [ifort] #
# requires: #
# - build-GEOSgcm-on-<< matrix.compiler >> #
# repo: GEOSgcm #
# #baselibs_version: *baselibs_version #
# #bcs_version: *bcs_version #
# gcm_ocean_type: MOM6 #
# change_layout: false #
######################################################
7 changes: 1 addition & 6 deletions .github/workflows/spack-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
fetch-depth: 1
filter: blob:none
repository: GEOS-ESM/GEOSgcm
ref: release/MAPL-v3

- name: Set all directories as git safe
run: |
Expand All @@ -50,12 +51,6 @@ jobs:
mepo clone --partial blobless
mepo status
- name: Mepo develop usual suspects
run: |
ls
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
mepo status
- name: Debug PR branch
run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"

Expand Down
6 changes: 1 addition & 5 deletions .github/workflows/workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
fetch-depth: 1
filter: blob:none
repository: GEOS-ESM/GEOSgcm
ref: release/MAPL-v3

- name: Set all directories as git safe
run: |
Expand All @@ -61,11 +62,6 @@ jobs:
mepo clone --partial blobless
mepo status
- name: Mepo develop usual suspects
run: |
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared GEOS_Util
mepo status
- name: Debug PR branch
run: echo "PR is coming from ${{ github.event.pull_request.head.ref }}"

Expand Down
3 changes: 2 additions & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSgwd_GridComp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ install( FILES ${resource_files}
esma_add_library (
${this}
SRCS ${srcs}
DEPENDENCIES GEOS_Shared MAPL ESMF::ESMF NetCDF::NetCDF_Fortran TYPE SHARED
DEPENDENCIES GEOS_Shared MAPL MAPL.generic3g MAPL.geom ESMF::ESMF NetCDF::NetCDF_Fortran TYPE SHARED
)

mapl_acg (
${this} GWD_StateSpecs.rc
IMPORT_SPECS EXPORT_SPECS INTERNAL_SPECS GET_POINTERS DECLARE_POINTERS
3g
)

# CMake has an OpenMP issue with NAG Fortran: https://gitlab.kitware.com/cmake/cmake/-/issues/21280
Expand Down
Loading