Skip to content

Commit 8e245d1

Browse files
mathomp4mathomp4
authored
Merge pull request #146 from GEOS-ESM/develop
Merge Develop into main for release
2 parents 45ac51c + c7faffe commit 8e245d1

File tree

10 files changed

+5994
-509
lines changed

10 files changed

+5994
-509
lines changed

‎.circleci/config.yml‎

Lines changed: 45 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -62,54 +62,65 @@ commands:
6262
compiler:
6363
type: string
6464
steps:
65-
- run: mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
65+
- run:
66+
name: "Versions, etc."
67+
command: |
68+
mpirun --version && << parameters.compiler >> --version && echo $BASEDIR && pwd && ls && echo "$(nproc)"
6669
6770
checkout_fixture:
6871
description: "Checkout fixture"
6972
parameters:
7073
repo:
7174
type: string
7275
steps:
73-
- run: |
74-
cd ${CIRCLE_WORKING_DIRECTORY}
75-
git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
76+
- run:
77+
name: "Checkout fixture"
78+
command: |
79+
cd ${CIRCLE_WORKING_DIRECTORY}
80+
git clone https://github.com/GEOS-ESM/<< parameters.repo >>.git
7681
7782
mepoclone:
7883
description: "Mepo clone external repos"
7984
parameters:
8085
repo:
8186
type: string
8287
steps:
83-
- run: |
84-
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
85-
mepo clone
86-
mepo status
88+
- run:
89+
name: "Mepo clone external repos"
90+
command: |
91+
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
92+
mepo clone
93+
mepo status
8794
8895
mepodevelop:
8996
description: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
9097
parameters:
9198
repo:
9299
type: string
93100
steps:
94-
- run: |
95-
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
96-
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
97-
mepo status
101+
- run:
102+
name: "Mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared"
103+
command: |
104+
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
105+
mepo develop GEOSgcm_GridComp GEOSgcm_App GMAO_Shared
106+
mepo status
98107
99108
checkout_feature_branch:
100109
description: "Mepo checkout-if-exists feature branch"
101110
parameters:
102111
repo:
103112
type: string
104113
steps:
105-
- run: |
106-
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
107-
echo "${CIRCLE_BRANCH}"
108-
if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
109-
then
110-
mepo checkout-if-exists ${CIRCLE_BRANCH}
111-
fi
112-
mepo status
114+
- run:
115+
name: "Mepo checkout-if-exists feature branch"
116+
command: |
117+
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
118+
echo "${CIRCLE_BRANCH}"
119+
if [ "${CIRCLE_BRANCH}" != "develop" ] && [ "${CIRCLE_BRANCH}" != "main" ]
120+
then
121+
mepo checkout-if-exists ${CIRCLE_BRANCH}
122+
fi
123+
mepo status
113124
114125
cmake:
115126
description: "Run CMake"
@@ -119,23 +130,27 @@ commands:
119130
compiler:
120131
type: string
121132
steps:
122-
- run: |
123-
mkdir -p /logfiles
124-
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
125-
mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
126-
cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
127-
cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
133+
- run:
134+
name: "Run CMake"
135+
command: |
136+
mkdir -p /logfiles
137+
cd ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >>
138+
mkdir -p ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
139+
cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
140+
cmake ${CIRCLE_WORKING_DIRECTORY}/<< parameters.repo >> -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=<< parameters.compiler >> -DCMAKE_BUILD_TYPE=Debug -DUSE_F2PY=OFF -DMPIEXEC_PREFLAGS=${MPIEXEC_PREFLAGS} -DCMAKE_INSTALL_PREFIX=${CIRCLE_WORKING_DIRECTORY}/workspace/install-<< parameters.repo >> |& tee /logfiles/cmake.log
128141
129142
buildinstall:
130143
description: "Build and install"
131144
parameters:
132145
repo:
133146
type: string
134147
steps:
135-
- run: |
136-
cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
137-
make -j"$(nproc)" install |& tee /logfiles/make.log
138-
#MEDIUM# make -j4 install |& tee /logfiles/make.log
148+
- run:
149+
name: "Build and install"
150+
command: |
151+
cd ${CIRCLE_WORKING_DIRECTORY}/workspace/build-<< parameters.repo >>
152+
make -j"$(nproc)" install |& tee /logfiles/make.log
153+
#MEDIUM# make -j4 install |& tee /logfiles/make.log
139154
140155
jobs:
141156
build-GEOSgcm:

‎.github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
## :memo: Automatic PR: `develop` → `release/MAPL-v3`
2+
3+
### Description
4+
5+
<!-- Write your description here -->
6+
7+
## :file_folder: Modified files
8+
<!-- Diff files - START -->
9+
<!-- Diff files - END -->
10+

‎.github/workflows/push-to-develop.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: Push to Develop
2+
3+
on:
4+
push:
5+
branches:
6+
- develop
7+
8+
jobs:
9+
pull_request:
10+
name: Create Pull Request
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Checkout repo
14+
uses: actions/checkout@v2
15+
with:
16+
fetch-depth: 0
17+
- name: Run the action
18+
uses: devops-infra/[email protected]
19+
with:
20+
github_token: ${{ secrets.GITHUB_TOKEN }}
21+
source_branch: develop
22+
target_branch: release/MAPL-v3
23+
label: automatic,MAPL3,Skip Changelog
24+
template: .github/PULL_REQUEST_TEMPLATE/auto_pr_to_mapl3.md
25+
get_diff: true
26+
assignee: ${{ github.actor }}
27+
old_string: "<!-- Write your description here -->"
28+
new_string: ${{ github.event.commits[0].message }}
29+
title: Auto PR - develop → MAPL-v3 - ${{ github.event.commits[0].message }}
30+

‎CMakeLists.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ set (srcs
1515
CubeToLatLon.F90
1616
CubeGridPrototype.F90
1717
GEOS_FV3_Utilities.F90
18+
fv_regrid_c2c.F90
19+
fv_regrid_c2c_bin.F90
20+
fv_regridding_utils.F90
21+
rs_scaleMod.F90
1822
)
1923

2024
if (ESMA_USE_GFE_NAMESPACE)
@@ -101,4 +105,10 @@ ecbuild_add_executable (
101105
LIBS ${this})
102106
set_target_properties (interp_restarts.x PROPERTIES LINK_FLAGS "${OpenMP_Fortran_FLAGS}")
103107

108+
ecbuild_add_executable (
109+
TARGET interp_restarts_bin.x
110+
SOURCES interp_restarts_bin.F90
111+
LIBS ${this})
112+
set_target_properties (interp_restarts_bin.x PROPERTIES LINK_FLAGS "${OpenMP_Fortran_FLAGS}")
113+
104114
add_subdirectory(scripts)

0 commit comments

Comments
 (0)