Skip to content

Commit

Permalink
Merge pull request #322 from GEOS-ESM/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
tclune authored Apr 17, 2020
2 parents 8dd1cd4 + fd725ba commit e23f20a
Show file tree
Hide file tree
Showing 188 changed files with 11,679 additions and 1,053 deletions.
61 changes: 61 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
version: 2.1

executors:
gcc-build-env:
docker:
- image: gmao/geos-build-env-gcc-source:6.0.10
environment:
OMPI_ALLOW_RUN_AS_ROOT: 1
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
OMPI_MCA_btl_vader_single_copy_mechanism: none

jobs:
build-and-test-GNU:
executor: gcc-build-env
working_directory: /root/project
steps:
- checkout
- run:
name: Versions, etc.
command: mpirun --version && gfortran --version && echo $BASEDIR && pwd && ls
- run:
name: Mepo clone external repos
command: |
mepo init
mepo clone
mepo status
- run:
name: CMake
command: |
mkdir build
cd build
cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe'
- run:
name: Build and install
command: |
cd build
make -j2 install
- run:
name: Run pFIO Unit tests
command: |
cd build
make -j2 pFIO_tests
ctest -R 'pFIO_tests$' --output-on-failure
- run:
name: Run MAPL_Base Unit tests
command: |
cd build
make -j2 MAPL_Base_tests
ctest -R 'MAPL_Base_tests$' --output-on-failure
- run:
name: Run MAPL_Profiler Unit tests
command: |
cd build
make -j2 MAPL_Profiler_tests
ctest -R 'MAPL_Profiler_tests$' --output-on-failure
workflows:
version: 2.1
pull_request_tests:
jobs:
- build-and-test-GNU
54 changes: 54 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Build MAPL

on: pull_request

jobs:
build_mapl:
runs-on: ubuntu-latest
container: gmao/geos-build-env-gcc-source:6.0.10
env:
LANGUAGE: en_US.UTF-8
LC_ALL: en_US.UTF-8
LANG: en_US.UTF-8
LC_TYPE: en_US.UTF-8
OMPI_ALLOW_RUN_AS_ROOT: 1
OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
OMPI_MCA_btl_vader_single_copy_mechanism: none
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 1
- name: Versions etc.
run: |
gfortran --version
mpirun --version
echo $BASEDIR
- name: Mepo clone external repos
run: |
mepo init
mepo clone
mepo status
- name: CMake
run: |
mkdir build
cd build
cmake .. -DBASEDIR=$BASEDIR/Linux -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS='--oversubscribe'
- name: Build
run: |
cd build
make -j4 install
- name: Run pFIO Unit tests
run: |
cd build
make -j4 pFIO_tests
ctest -R 'pFIO_tests$' --output-on-failure
- name: Run MAPL_Base Unit tests
run: |
cd build
make -j4 MAPL_Base_tests
ctest -R 'MAPL_Base_tests$' --output-on-failure
- name: Run MAPL_Profiler Unit tests
run: |
cd build
make -j4 MAPL_Profiler_tests
ctest -R 'MAPL_Profiler_tests$' --output-on-failure
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
*~
/@cmake
/@cmake/
/@env/
/BUILD/
/build*/
/install*/
/.mepo/
1 change: 1 addition & 0 deletions Apps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
file (COPY MAPL_GridCompSpecs_ACG.py DESTINATION ${esma_etc}/MAPL)
Loading

0 comments on commit e23f20a

Please sign in to comment.