Skip to content

Commit c443cec

Browse files
mathomp4mathomp4
authored
Merge pull request #414 from GEOS-ESM/feature/#4600-rename-MAPL-MAPL2-MAPL3-MAPL
2 parents 221da4b + 13d9734 commit c443cec

11 files changed

Lines changed: 51 additions & 45 deletions

File tree

‎.circleci/config.yml‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -21,38 +21,38 @@ workflows:
2121
#baselibs_version: *baselibs_version
2222
repo: GEOSgcm
2323
checkout_fixture: true
24-
# V12 code uses a special branch for now.
25-
fixture_branch: feature/sdrabenh/gcm_v12
26-
# We comment out this as it will "undo" the fixture_branch
27-
#mepodevelop: true
28-
persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
24+
mepodevelop: false
25+
fixture_branch: release/MAPL-v3
26+
persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
2927

30-
# Run AMIP GCM (1 hour, no ExtData)
31-
- ci/run_gcm:
32-
name: run-GCM-on-<< matrix.compiler >>
33-
context:
34-
- docker-hub-creds
35-
matrix:
36-
parameters:
37-
compiler: [gfortran, ifort]
38-
requires:
39-
- build-GEOSgcm-on-<< matrix.compiler >>
40-
repo: GEOSgcm
41-
#baselibs_version: *baselibs_version
42-
#bcs_version: *bcs_version
43-
44-
# Run Coupled GCM (1 hour, no ExtData)
45-
- ci/run_gcm:
46-
name: run-coupled-GCM-on-<< matrix.compiler >>
47-
context:
48-
- docker-hub-creds
49-
matrix:
50-
parameters:
51-
compiler: [ifort]
52-
requires:
53-
- build-GEOSgcm-on-<< matrix.compiler >>
54-
repo: GEOSgcm
55-
#baselibs_version: *baselibs_version
56-
#bcs_version: *bcs_version
57-
gcm_ocean_type: MOM6
58-
change_layout: false
28+
######################################################
29+
# # Run AMIP GCM (1 hour, no ExtData) #
30+
# - ci/run_gcm: #
31+
# name: run-GCM-on-<< matrix.compiler >> #
32+
# context: #
33+
# - docker-hub-creds #
34+
# matrix: #
35+
# parameters: #
36+
# compiler: [gfortran, ifort] #
37+
# requires: #
38+
# - build-GEOSgcm-on-<< matrix.compiler >> #
39+
# repo: GEOSgcm #
40+
# #baselibs_version: *baselibs_version #
41+
# #bcs_version: *bcs_version #
42+
# #
43+
# # Run Coupled GCM (1 hour, no ExtData) #
44+
# - ci/run_gcm: #
45+
# name: run-coupled-GCM-on-<< matrix.compiler >> #
46+
# context: #
47+
# - docker-hub-creds #
48+
# matrix: #
49+
# parameters: #
50+
# compiler: [ifort] #
51+
# requires: #
52+
# - build-GEOSgcm-on-<< matrix.compiler >> #
53+
# repo: GEOSgcm #
54+
# #baselibs_version: *baselibs_version #
55+
# #bcs_version: *bcs_version #
56+
# gcm_ocean_type: MOM6 #
57+
# change_layout: false #
58+
######################################################

‎.github/workflows/workflow.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ jobs:
2626
compiler: ${{ matrix.compiler }}
2727
cmake-build-type: ${{ matrix.build-type }}
2828
fixture-repo: GEOS-ESM/GEOSgcm
29-
fixture-ref: feature/sdrabenh/gcm_v12
29+
fixture-ref: release/MAPL-v3
30+
run-mepo-develop: false
3031

3132
spack_build:
3233
uses: GEOS-ESM/CI-workflows/.github/workflows/spack_gcc_build.yml@project/geosgcm
@@ -35,5 +36,10 @@ jobs:
3536
BUILDCACHE_TOKEN: ${{ secrets.BUILDCACHE_TOKEN }}
3637
with:
3738
fixture-repo: GEOS-ESM/GEOSgcm
38-
fixture-ref: feature/sdrabenh/gcm_v12
39+
fixture-ref: release/MAPL-v3
40+
run-mepo-develop: false
41+
patch-esmf: true
42+
# There is some weird issue with spack builds and the install step with
43+
# MAPL 3. For now, turn off as we don't need to *run* GEOS.
44+
run-install: false
3945

‎GEOS_Shared/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set (srcs
88
getco2.F90 atmOceanIntLayer.F90
99
)
1010

11-
esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
11+
esma_add_library(${this} SRCS ${srcs} DEPENDENCIES MAPL2 MAPL ESMF::ESMF NetCDF::NetCDF_Fortran)
1212

1313
# special cases
1414
set_source_files_properties(sphere.F PROPERTIES COMPILE_FLAGS "${FREAL8}")

‎GEOS_Shared/G3_MPI_Util_Mod.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "unused_dummy.H"
22
module G3_MPI_Util_Mod
33

4-
use MAPL
4+
use MAPL2
55
implicit none
66

77
! Define Lattice

‎GEOS_Shared/GEOS_TopoGet.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module GEOS_TopoGetMod
1414
! !USES:
1515

1616
use ESMF
17-
use MAPL
17+
use MAPL2
1818

1919
implicit none
2020
private

‎GEOS_Shared/OVP.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ module OVP
1313
! !USES:
1414

1515
use ESMF
16-
use MAPL
16+
use MAPL2
1717

1818
implicit none
1919
private

‎GEOS_Shared/atmOceanIntLayer.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module atmOcnIntlayer
22

33
! !USES:
44

5-
use MAPL
5+
use MAPL2
66
use GEOS_UtilsMod, only: GEOS_QSAT, GEOS_DQSAT
77

88
implicit none

‎GEOS_Shared/condense.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ subroutine condensation(T,P,Qv,Ql,SuperSat)
3131

3232
subroutine Iterate(TT,PP,QQ,QC,SuperSat)
3333

34-
use MAPL, only : QSAT=>MAPL_EQSAT, MAPL_ALHL, MAPL_CP, MAPL_AIRMW, MAPL_RUNIV, MAPL_RDRY, MAPL_RGAS, MAPL_CP
34+
use MAPL2, only : QSAT=>MAPL_EQSAT, MAPL_ALHL, MAPL_CP, MAPL_AIRMW, MAPL_RUNIV, MAPL_RDRY, MAPL_RGAS, MAPL_CP
3535

3636
implicit none
3737

‎GEOS_Shared/surfacelayer.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module sfclayer
55

66
! !USES:
77

8-
use MAPL
8+
use MAPL2
99
use DragCoefficientsMod
1010

1111
implicit none

‎GEOS_Shared/tropovars.F90‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ subroutine tropovars (im,jm,lm,ple,pl, &
6262
!
6363
!********************************************************************
6464

65-
use MAPL
65+
use MAPL2
6666

6767
implicit none
6868

0 commit comments

Comments
 (0)