forked from NOAA-GFDL/MOM6-examples
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'dev/gfdl/2018.08.25' into ESM4-maintenance
dev/gfdl/2018.08.25 24106e5 icebergs: Merge pull request NOAA-GFDL#59 from wfcooke/user/wfc/calving_restart_timestamp 2741a88 MOM6: Merge pull request #844 from adcroft/avoid-domain_aux-for-wind-stagger b864fed MOM6: Merge branch 'Hallberg-NOAA-streamline_restore_state' into dev/gfdl 5dcd7c3 SIS2: +Temporarily avoid new update_ocean_model args f45003c Use IO_LAYOUT=2,2 in global_ALE 5007183 MOM6: Merge pull request #841 from adcroft/fix-oob-restart-filename f6ae30c MOM6: Merge pull request #839 from MJHarrison-GFDL/rotation_angle_diagnostic e795958 Merge branch 'Hallberg-NOAA-use_stress_mag' into dev/gfdl 9f11b05 Updated examples with use_stress_mag d11c6a4 SIS2: Merge branch 'Hallberg-NOAA-add_stress_mag' into dev/gfdl 98b627c Merge branch 'dev/master' into dev/gfdl 78cfb2d MOM6: Merge pull request #820 from adcroft/fix-doxy-1.8.4 7e5d936 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl fbe2918 MOM6: Merge pull request #820 from adcroft/fix-doxy-1.8.4 ed36e93 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl 054912d Merge branch 'dev/master' into dev/gfdl 9025815 MOM6: Merge branch 'gustavo-marques-update_KPP' into dev/master aeda3c9 SIS2: Merge branch 'Hallberg-NOAA-dOxyGenize_SIS2' into dev/gfdl e937dd8 Merge branch 'Hallberg-NOAA-vertex_shearmix' into dev/gfdl ea2a6be MOM6: Merge pull request #801 from Hallberg-NOAA/vertex_shearmix ab45a7d Merge branch 'vertex_shearmix' of https://github.com/Hallberg-NOAA/MOM6-examples into Hallberg-NOAA-vertex_shearmix 7632200 MOM6: Merge pull request #799 from adcroft/aniso-hor-visc 4bac59b Update examples with VERTEX_SHEAR a2162e4 MOM6: Merge branch 'ESMG-cleaning' into dev/gfdl f894815 MOM6: *Merge branch 'ESMG-dev/esmg' into dev/gfdl f1e9681 Merge branch 'dev/master' into dev/gfdl 5d17daf MOM6: Merge pull request #787 from NOAA-GFDL/dev-master-candidate-2018-06-03 48d4f8d MOM6: Merge branch 'dev/master' into dev/gfdl 0a13ed9 MOM6: Merge branch 'gustavo-marques-add_old_double_diffusion' into dev/master f2aa2bd MOM6: Merge branch 'gustavo-marques-legacy_diabatic_driver' into dev/master 20799a1 MOM6: Merge pull request #774 from NOAA-GFDL/dev-master-candidate-2018-05-15 72580e8 MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl bed9677 Merge branch 'adcroft-disable-kpp-in-single-col-bml' into dev/gfdl f2fd688 Disable KPP in single_column/BML experiment dc9b61d gitlab: Adds testing of MOM6_parameter_doc and updates coverage d84538c MOM6: Merge pull request #760 from ESMG/dev/esmg 3bcc768 MOM6: Merge branch 'MJHarrison-GFDL-MOM6_DA_rename' into dev/gfdl ae71364 Travis: added script to build with OpenMP c465130 mkmf: Updated to allow -l option 7339de5 MOM6: Merge branch 'Hallberg-NOAA-correct_reset_dtbt' into dev/gfdl 28a4377 Merge branch 'correct_reset_dtbt' of https://github.com/Hallberg-NOAA/MOM6-examples into Hallberg-NOAA-correct_reset_dtbt b06285a MOM6: Merge branch 'MJHarrison-GFDL-MOM6_DA' into dev/gfdl c903983 MOM6: Merged dev/ncar & dev/master into dev/gfdl 1091210 MOM6: Merged dev/ncar into dev/master fd12185 Revert "mkmf: Updated to latest version on master branch" 2beb300 mkmf: Updated to latest version on master branch 4c080d1 MOM6: (*)Do not recalculate DTBT every coupled timestep b40aa92 MOM6: Merge branch 'breichl-breichl/user/bgr/waves_update' into dev/gfdl
- Loading branch information
Showing
226 changed files
with
8,074 additions
and
6,001 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,3 +21,5 @@ seaice.stats.* | |
.ipynb_checkpoints | ||
# Ignore anything labeled ignore | ||
*.ignore | ||
# Ignore lcov files | ||
lcov.* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
parameter_files: | ||
tags: | ||
- ncrc3 | ||
- ncrc4 | ||
script: | ||
# Install / update testing scripts | ||
- git clone https://github.com/adcroft/MRS.git build_MRS | ||
# Recursively clone submodules | ||
- git submodule sync --recursive && git submodule update --init --recursive | ||
# Clone other components | ||
- test -d src/LM3 || make -f build_MRS/Makefile.clone CONFIGS=. clone_gfdl -s | ||
# Create mannifest of experiments to run | ||
- git clone http://gitlab.gfdl.noaa.gov/ogrp/Gaea-stats-MOM6-examples.git tests && mv tests/regressions . && rm -rf tests | ||
- bash build_MRS/generate_manifest.sh . > manifest.mk && rm -rf regressions | ||
# Build executables | ||
- time make -f build_MRS/Makefile.build build_gnu CONFIGS=. -s -j | ||
# Run standard tests | ||
- echo "make -f build_MRS/Makefile.run gnu_all MEMORY=dynamic_symmetric CONFIGS=. -s -j" > job.sh | ||
- msub -l partition=c3:c4,nodes=25,walltime=00:08:00,qos=norm -q debug -S /bin/tcsh -j oe -A gfdl_o -z -o log.$CI_PIPELINE_ID -N mom6_examples_test -K job.sh | ||
# Check status of doc files | ||
- git status | ||
- git diff --exit-code | ||
|
||
coverage: | ||
tags: | ||
- ncrc3 | ||
- ncrc4 | ||
script: | ||
# Install / update testing scripts | ||
- git clone https://github.com/adcroft/MRS.git build_MRS | ||
# Recursively clone submodules | ||
- git submodule sync --recursive && git submodule update --init --recursive | ||
# Clone other components | ||
- test -d src/LM3 || make -f build_MRS/Makefile.clone CONFIGS=. clone_gfdl -s | ||
# Create mannifest of experiments to run | ||
- git clone http://gitlab.gfdl.noaa.gov/ogrp/Gaea-stats-MOM6-examples.git tests && mv tests/regressions . && rm -rf tests | ||
- bash build_MRS/generate_manifest.sh . > manifest.mk && rm -rf regressions | ||
# Build executables | ||
- time make -f build_MRS/Makefile.build coverage_gnu CONFIGS=. EXTRA_MAKE_ARGS="FFLAGS_COVERAGE=--coverage LDFLAGS_COVERAGE=--coverage" -s -j | ||
# Run standard tests | ||
- echo "time make -f build_MRS/Makefile.coverage gnu_ocean_only gnu_ice_ocean_SIS2 MEMORY=dynamic_symmetric CONFIGS=." > job.sh | ||
- msub -l partition=c3:c4,nodes=15,walltime=00:37:00,qos=norm -q debug -S /bin/tcsh -j oe -A gfdl_o -z -o log.$CI_PIPELINE_ID -N mom6_coverage -K job.sh | ||
# Process lcov files | ||
- make -f build_MRS/Makefile.coverage CONFIGS=. coverage | ||
# Post to codecov | ||
- cd src/MOM6 ; curl -s https://codecov.io/bash > codecov.sh | ||
- GITLAB_CI="" | ||
- PWD=`pwd` bash codecov.sh -t $CODECOV_TOKEN -X gcov |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.