Skip to content

Commit 326ccf6

Browse files
mnlevy1981mnlevy1981
committed
Merge branch 'main' into add_MARBL
2 parents e3eba33 + 6c5b8fb commit 326ccf6

30 files changed

+1809
-1016
lines changed

‎.github/workflows/extbuild.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ jobs:
2020
CPPFLAGS: "-I/usr/include -I/usr/local/include"
2121

2222
# Versions of all dependencies can be updated here
23-
ESMF_VERSION: v8.6.0
23+
ESMF_VERSION: v8.6.1
2424
PNETCDF_VERSION: checkpoint.1.12.3
2525
NETCDF_FORTRAN_VERSION: v4.6.1
2626
PIO_VERSION: pio2_6_2
27-
CDEPS_VERSION: cdeps1.0.26
27+
CDEPS_VERSION: cdeps1.0.36
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
# Build the ESMF library, if the cache contains a previous build
3131
# it will be used instead
3232
- id: load-env
@@ -40,13 +40,13 @@ jobs:
4040
sudo apt-get install pnetcdf-bin libpnetcdf-dev
4141
sudo apt-get install autotools-dev autoconf
4242
- id: cache-esmf
43-
uses: actions/cache@v3
43+
uses: actions/cache@v4
4444
with:
4545
path: ~/ESMF
4646
key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF
4747
- name: Cache ParallelIO
4848
id: cache-ParallelIO
49-
uses: actions/cache@v3
49+
uses: actions/cache@v4
5050
with:
5151
path: ~/pio
5252
key: ${{ runner.os }}-${{ env.PIO_VERSION }}.pio
@@ -71,31 +71,35 @@ jobs:
7171
parallelio_path: $HOME/pio
7272
- name: Cache CDEPS
7373
id: cache-cdeps
74-
uses: actions/cache@v3
74+
uses: actions/cache@v4
7575
with:
76-
path: $HOME/cdeps
77-
key: ${{ runner.os }}-${{ env.CDEPS_VERSION }}.cdeps
76+
path: /homme/runner/work/CMEPS/CMEPS/build-cdeps
77+
key: ${{ runner.os }}-${{ env.CDEPS_VERSION }}.cdeps1
7878

7979
- name: checkout CDEPS
80-
uses: actions/checkout@v3
80+
uses: actions/checkout@v4
8181
with:
8282
repository: ESCOMP/CDEPS
8383
path: cdeps-src
8484
ref: ${{ env.CDEPS_VERSION }}
85+
- name: get genf90
86+
run: |
87+
cd cdeps-src
88+
git submodule update --init
8589
- name: Build CDEPS
8690
if: steps.cache-cdeps.outputs.cache-hit != 'true'
8791
uses: ESCOMP/CDEPS/.github/actions/[email protected]
8892
with:
8993
esmfmkfile: $HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
9094
pio_path: $HOME/pio
9195
src_root: ${GITHUB_WORKSPACE}/cdeps-src
92-
cmake_flags: " -Wno-dev -DCMAKE_BUILD_TYPE=DEBUG -DWERROR=ON -DCMAKE_Fortran_FLAGS=\"-DCPRGNU -g -Wall \
96+
cmake_flags: " -Wno-dev -DDISABLE_FoX=ON -DCMAKE_BUILD_TYPE=DEBUG -DWERROR=ON -DCMAKE_Fortran_FLAGS=\"-DCPRGNU -g -Wall \
9397
-ffree-form -ffree-line-length-none -fallow-argument-mismatch \""
9498

9599
- name: Build CMEPS
96100
run: |
97-
export ESMFMKFILE=$HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
98101
export PIO=$HOME/pio
102+
export ESMFMKFILE=$HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
99103
mkdir build-cmeps
100104
pushd build-cmeps
101105
cmake -DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_Fortran_FLAGS="-g -Wall -Werror -ffree-form -ffree-line-length-none -Wno-unused-dummy-argument -I /home/runner/work/CMEPS/CMEPS/build-cdeps/share" ../

‎.github/workflows/srt.yml

Lines changed: 32 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
CPPFLAGS: "-I/usr/include -I/usr/local/include "
2727
LDFLAGS: "-L/usr/lib/x86_64-linux-gnu -lnetcdf -lnetcdff -lpnetcdf"
2828
# Versions of all dependencies can be updated here
29-
ESMF_VERSION: v8.6.0
29+
ESMF_VERSION: v8.6.1
3030
PARALLELIO_VERSION: pio2_6_2
3131
CIME_MODEL: cesm
3232
CIME_DRIVER: nuopc
@@ -64,13 +64,13 @@ jobs:
6464
run: pip install -r requirements.txt
6565
# use the latest cesm main
6666
- name: cesm checkout
67-
uses: actions/checkout@v3
67+
uses: actions/checkout@v4
6868
with:
6969
repository: ESCOMP/CESM
7070
path: cesm
7171
# this cmeps commit
7272
- name: cmeps checkout
73-
uses: actions/checkout@v3
73+
uses: actions/checkout@v4
7474
with:
7575
path: cesm/components/cmeps
7676

@@ -79,7 +79,7 @@ jobs:
7979
- name: checkout externals
8080
run: |
8181
pushd cesm
82-
./manage_externals/checkout_externals ccs_config cdeps share mct cpl7 parallelio
82+
./bin/git-fleximod update ccs_config cdeps share mct parallelio
8383
cd ccs_config
8484
git checkout main
8585
cd ../
@@ -94,72 +94,55 @@ jobs:
9494
git submodule update --init
9595
cd ../components/cdeps
9696
git checkout main
97+
git submodule update --init
98+
cd ../../share
99+
git checkout main
97100
98101
- name: Cache ESMF
99102
id: cache-esmf
100-
uses: actions/cache@v3
103+
uses: actions/cache@v4
101104
with:
102105
path: ~/ESMF
103-
key: ${{ runner.os }}-${{ env.ESMF_VERSION }}-ESMF1
104-
# - name: cache pnetcdf
105-
# id: cache-pnetcdf
106-
# uses: actions/cache@v3
107-
# with:
108-
# path: ~/pnetcdf
109-
# key: ${{ runner.os }}-${{ env.PNETCDF_VERSION}}-pnetcdf
110-
111-
# - name: Cache netcdf-fortran
112-
# id: cache-netcdf-fortran
113-
# uses: actions/cache@v3
114-
# with:
115-
# path: ~/netcdf-fortran
116-
# key: ${{ runner.os }}-${{ env.NETCDF_FORTRAN_VERSION }}-netcdf-fortran
106+
key: ${{ runner.os }}-${{ env.ESMF_VERSION }}
117107

118108
- name: Cache ParallelIO
119109
id: cache-ParallelIO
120-
uses: actions/cache@v3
110+
uses: actions/cache@v4
121111
with:
122-
path: ~/pio
112+
path: ${GITHUB_WORKSPACE}/pio
123113
key: ${{ runner.os }}-${{ env.PARALLELIO_VERSION }}.parallelio
114+
124115
- name: Cache inputdata
125116
id: cache-inputdata
126-
uses: actions/cache@v3
117+
uses: actions/cache@v4
127118
with:
128119
path: $HOME/cesm/inputdata
129120
key: inputdata
130-
# - name: Build PNetCDF
131-
# if: steps.cache-pnetcdf.outputs.cache-hit != 'true'
132-
# uses: ESCOMP/CDEPS/.github/actions/buildpnetcdf@e06246b560d3132170bb1a5443fa3d65dfbd2040
133-
# with:
134-
# pnetcdf_version: ${{ env.PNETCDF_VERSION }}
135-
# install_prefix: $HOME/pnetcdf
136-
# - name: Build NetCDF Fortran
137-
# if: steps.cache-netcdf-fortran.outputs.cache-hit != 'true'
138-
# uses: ESCOMP/CDEPS/.github/actions/buildnetcdff@e06246b560d3132170bb1a5443fa3d65dfbd2040
139-
# with:
140-
# netcdf_fortran_version: ${{ env.NETCDF_FORTRAN_VERSION }}
141-
# install_prefix: $HOME/netcdf-fortran
142-
# netcdf_c_path: /usr
121+
143122
- name: Build ParallelIO
144123
if: steps.cache-PARALLELIO.outputs.cache-hit != 'true'
145124
uses: NCAR/ParallelIO/.github/actions/parallelio_cmake@05173a6556ea8d80eb34e3881a5014ea8f4b7543
146125
with:
147126
parallelio_version: ${{ env.ParallelIO_VERSION }}
148127
enable_fortran: True
149-
install_prefix: /home/runner/pio
128+
install_prefix: ${GITHUB_WORKSPACE}/pio
150129

151-
- name: Build ESMF
152-
if: steps.cache-esmf.outputs.cache-hit != 'true'
153-
uses: ESCOMP/CDEPS/.github/actions/buildesmf@e06246b560d3132170bb1a5443fa3d65dfbd2040
130+
- name: Install ESMF
131+
uses: esmf-org/install-esmf-action@v1
132+
env:
133+
ESMF_COMPILER: gfortran
134+
ESMF_BOPT: g
135+
ESMF_COMM: openmpi
136+
ESMF_NETCDF: nc-config
137+
ESMF_PNETCDF: pnetcdf-config
138+
ESMF_INSTALL_PREFIX: ${GITHUB_WORKSPACE}/ESMF
139+
ESMF_PIO: external
140+
ESMF_PIO_INCLUDE: ${GITHUB_WORKSPACE}/pio/include
141+
ESMF_PIO_LIBPATH: ${GITHUB_WORKSPACE}/pio/lib
154142
with:
155-
esmf_version: ${{ env.ESMF_VERSION }}
156-
esmf_bopt: g
157-
esmf_comm: openmpi
158-
install_prefix: ~/ESMF
159-
netcdf_c_path: /usr
160-
netcdf_fortran_path: /usr
161-
pnetcdf_path: /usr
162-
parallelio_path: ~/pio
143+
version: ${{ env.ESMF_VERSION }}
144+
esmpy: false
145+
cache: true
163146

164147

165148
- name: PREP for scripts regression test
@@ -169,14 +152,13 @@ jobs:
169152
pushd $GITHUB_WORKSPACE/cesm/cime/CIME/tests
170153
export SRCROOT=$GITHUB_WORKSPACE/cesm/
171154
export CIME_TEST_PLATFORM=ubuntu-latest
172-
export PIO_INCDIR=$HOME/pio/include
173-
export PIO_LIBDIR=$HOME/pio/lib
155+
export PIO_INCDIR=$GITHUB_WORKSPACE/pio/include
156+
export PIO_LIBDIR=$GITHUB_WORKSPACE/pio/lib
174157
export PIO_VERSION_MAJOR=2
175158
export PIO_TYPENAME_VALID_VALUES="netcdf,pnetcdf"
176159
export NETCDF_PATH=/usr
177160
export PNETCDF_PATH=/usr
178161
export LD_LIBRARY_PATH=/usr/lib/libx86_64-linux-gnu/:$LD_LIBRARY_PATH
179-
export ESMFMKFILE=$HOME/ESMF/lib/libg/Linux.gfortran.64.openmpi.default/esmf.mk
180162
cat <<EOF >> $GITHUB_WORKSPACE/cesm/ccs_config/machines/cmake_macros/ubuntu-latest.cmake
181163
set(NetCDF_Fortran_INCLUDE_DIR /usr/include)
182164
set(NetCDF_Fortran_LIBRARY /usr/lib/x86_64-gnu-Linux/libnetcdff.so)

‎cesm/driver/esm.F90

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,7 +796,6 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
796796
#ifndef NO_MPI2
797797
use mpi , only : MPI_COMM_NULL, mpi_comm_size
798798
#endif
799-
use m_MCTWorld , only : mct_world_init => init
800799

801800
#ifdef MED_PRESENT
802801
use med_internalstate_mod , only : med_id
@@ -878,6 +877,9 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
878877
character(len=5) :: inst_suffix
879878
character(CL) :: cvalue
880879
logical :: found_comp
880+
#ifdef ESMF_AWARE_THREADING
881+
integer :: cnt
882+
#endif
881883
integer :: rank, nprocs, ierr
882884
character(len=*), parameter :: subname = "(esm_pelayout.F90:esm_init_pelayout)"
883885
!---------------------------------------
@@ -1164,9 +1166,6 @@ subroutine esm_init_pelayout(driver, maxthreads, rc)
11641166

11651167
enddo
11661168

1167-
call mct_world_init(componentCount+1, GLOBAL_COMM, comms, comps)
1168-
1169-
11701169
deallocate(petlist, comms, comps, comp_iamin, comp_comm_iam)
11711170

11721171
end subroutine esm_init_pelayout

‎cesm/nuopc_cap_share/seq_drydep_mod.F90

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module seq_drydep_mod
22

33
use shr_drydep_mod, only: seq_drydep_setHCoeff=>shr_drydep_setHCoeff
4-
use shr_drydep_mod
5-
64
implicit none
75

86
! method specification

0 commit comments

Comments
 (0)