Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DO NOT MERGE, testing CI #1226

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
a9c2bf0
change to README
edwardhartnett Jan 11, 2024
845dad5
adding w3iopomd
edwardhartnett Jan 11, 2024
b8c7f62
cmake changes
edwardhartnett Jan 11, 2024
a49486f
cmake changes
edwardhartnett Jan 11, 2024
051a773
cmake changes
edwardhartnett Jan 11, 2024
b199a1f
cmake changes
edwardhartnett Jan 11, 2024
cd3430a
cmake changes
edwardhartnett Jan 11, 2024
735e15d
cmake changes
edwardhartnett Jan 11, 2024
330ad8e
clean up
edwardhartnett Jan 11, 2024
4cc5ef2
adding testing for binary restart file
edwardhartnett Jan 13, 2024
431e8c5
working on test
edwardhartnett Jan 13, 2024
59f4ada
merged develop
edwardhartnett Jan 24, 2024
106e652
merged
edwardhartnett Jan 25, 2024
5a3c0b9
ww3_outp.F90: hard-coded new subroutine (W3IOPON)
MatthewMasarik-NOAA Feb 8, 2024
edaf3f7
gx_outp.F90 - W3IOPON
MatthewMasarik-NOAA Feb 14, 2024
faaa0c7
w3wavemd.F90: W3IOPON
MatthewMasarik-NOAA Feb 14, 2024
86a5233
wmiopomd.F90: W3IOPON
MatthewMasarik-NOAA Feb 14, 2024
bafe7ea
ww3_ounp.F90: W3IOPON
MatthewMasarik-NOAA Feb 14, 2024
a65e4a8
ww3_outp.F90: W3IOPON
MatthewMasarik-NOAA Feb 14, 2024
2ef2d51
w3iopomd.F90: print statement
MatthewMasarik-NOAA Feb 14, 2024
e7e176b
small modifications to w3iopo for netcdf file name and removing print
JessicaMeixner-NOAA Feb 21, 2024
24c9e9f
updates to documentation
JessicaMeixner-NOAA Feb 22, 2024
7a1dca3
Merge branch 'NOAA-EMC:develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Mar 11, 2024
8e27cb7
Merge branch 'NOAA-EMC:develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Mar 12, 2024
3b244cb
added notes for where time should be added and examined how
JessicaMeixner-NOAA Mar 12, 2024
f0c8aa9
a first try at adding time dimension
JessicaMeixner-NOAA Mar 13, 2024
0307f60
adding time dimension
edwardhartnett Mar 27, 2024
df4d393
turning on tests
edwardhartnett Mar 30, 2024
bbd316a
Merge pull request #19 from edwardhartnett/ejh_0330_2
edwardhartnett Mar 30, 2024
a24fb35
more testing
edwardhartnett Mar 31, 2024
b2b7129
renamed file
edwardhartnett Apr 1, 2024
d06cdd4
adding regtest document
edwardhartnett Apr 1, 2024
ab960ed
adding detail
edwardhartnett Apr 1, 2024
f26541e
more info
edwardhartnett Apr 1, 2024
9366dca
added tests to cmake file
edwardhartnett Apr 1, 2024
22e0bf4
commenting out some of test
edwardhartnett Apr 1, 2024
44c5409
commenting out some of test
edwardhartnett Apr 1, 2024
d16dd91
Merge pull request #20 from edwardhartnett/ejh_doc_0331
edwardhartnett Apr 1, 2024
3c44e61
added netCDF code
edwardhartnett Apr 1, 2024
17e6ee6
uncommenting test code
edwardhartnett Apr 1, 2024
3d2c19e
added reference
edwardhartnett Apr 2, 2024
7af89cc
more detail
edwardhartnett Apr 2, 2024
16339bb
more detail
edwardhartnett Apr 2, 2024
88894f9
Merge pull request #22 from edwardhartnett/ejh_0401
edwardhartnett Apr 2, 2024
ba26fd8
adding regtest CI
edwardhartnett Apr 2, 2024
d65d63d
working on regtest CI
edwardhartnett Apr 2, 2024
b4893d2
working on regtest CI
edwardhartnett Apr 2, 2024
3b424f8
working on regtest CI
edwardhartnett Apr 2, 2024
8270389
more regtest work
edwardhartnett Apr 2, 2024
9f2e25f
more detail
edwardhartnett Apr 2, 2024
f35a196
more details
edwardhartnett Apr 2, 2024
fdbb2b8
trying a regtest
edwardhartnett Apr 2, 2024
1e3f301
Merge remote-tracking branch 'EH/ejh_test_ci' into feature/pointbinar…
JessicaMeixner-NOAA Apr 2, 2024
fe5c982
Merge remote-tracking branch 'EMC/develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Apr 2, 2024
1dd3e75
fix typo
JessicaMeixner-NOAA Apr 2, 2024
ea46887
regtest progress
edwardhartnett Apr 2, 2024
0ff57b7
regtest progress
edwardhartnett Apr 2, 2024
6ec78a9
regtest progress
edwardhartnett Apr 2, 2024
a70ed47
more regtest
edwardhartnett Apr 2, 2024
57deae1
more regtest
edwardhartnett Apr 2, 2024
34c3f8c
more regtest
edwardhartnett Apr 2, 2024
14f771d
fixes errors for successful build
JessicaMeixner-NOAA Apr 2, 2024
bcca5f5
Merge remote-tracking branch 'EMC/develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Apr 2, 2024
6cfc1c1
save debug temporarily
JessicaMeixner-NOAA Apr 2, 2024
ec1dc84
attempt to add start/count to netcdf putvar
JessicaMeixner-NOAA Apr 2, 2024
4e4c93e
Merge pull request #23 from edwardhartnett/ejh_ci_regtest
edwardhartnett Apr 2, 2024
4ad5794
merged
edwardhartnett Apr 2, 2024
10d8187
fixed merge problem
edwardhartnett Apr 2, 2024
b8057a7
try to add enddef to see if that fixes issue
JessicaMeixner-NOAA Apr 2, 2024
af3dcd1
put enddef in correct location
JessicaMeixner-NOAA Apr 2, 2024
bcd4380
fixed merge problem
edwardhartnett Apr 2, 2024
15ee016
inquire variable IDs if it's not the first time through the file
JessicaMeixner-NOAA Apr 2, 2024
402d16a
fix for grdid
JessicaMeixner-NOAA Apr 2, 2024
7331db1
can write file, adding write to check content
JessicaMeixner-NOAA Apr 2, 2024
46a9ff8
fix output in write for dimensions
JessicaMeixner-NOAA Apr 3, 2024
3fcec44
fixing
edwardhartnett Apr 3, 2024
ca38250
more detail
edwardhartnett Apr 3, 2024
479029f
merged
edwardhartnett Apr 3, 2024
9ce71d8
reverted file
edwardhartnett Apr 3, 2024
7fe0922
add wdo to write and zero out II, IL, IW as in binary output
JessicaMeixner-NOAA Apr 3, 2024
b1bcf91
fixed cmake
edwardhartnett Apr 3, 2024
3b729b2
add writing of cdo
JessicaMeixner-NOAA Apr 3, 2024
d439be7
int -> float for appropriate variables
JessicaMeixner-NOAA Apr 3, 2024
a9f4f0f
pass tests
edwardhartnett Apr 3, 2024
4c99c06
Merge pull request #25 from edwardhartnett/JessicaMeixner-NOAA-featur…
edwardhartnett Apr 3, 2024
7b2c636
add time variable to output
JessicaMeixner-NOAA Apr 3, 2024
ccfae36
clean up of write debug statements and add a few comments
JessicaMeixner-NOAA Apr 3, 2024
3502b6d
remove the open and inquiries from the ipass=1 section of the read
JessicaMeixner-NOAA Apr 3, 2024
7929998
debugging tries for read routine
JessicaMeixner-NOAA Apr 3, 2024
233c141
Merge remote-tracking branch 'EMC/develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Apr 3, 2024
8bb4529
Merge pull request #21 from edwardhartnett/ejh_regtest_doc
edwardhartnett Apr 4, 2024
1ede4e0
porting changes
edwardhartnett Apr 4, 2024
7594701
merged Jessica's changes
edwardhartnett Apr 4, 2024
30fafe3
update documentation PTLOC is a real not int
JessicaMeixner-NOAA Apr 4, 2024
131a917
test writes netCDF file
edwardhartnett Apr 4, 2024
1bc281e
Merge pull request #27 from edwardhartnett/ejh_0404
edwardhartnett Apr 4, 2024
8b158fe
minor change
edwardhartnett Apr 5, 2024
3778822
Merge branch 'NOAA-EMC:develop' into feature/pointbinary2nc
JessicaMeixner-NOAA Apr 8, 2024
c2b04b0
Merge branch 'feature/pointbinary2nc' of github.com:JessicaMeixner-NO…
JessicaMeixner-NOAA Apr 8, 2024
15f7a59
saving debug output write
JessicaMeixner-NOAA Apr 8, 2024
3bb3a1f
added expected output for regtest
edwardhartnett Apr 9, 2024
59d7d7f
updated workflow
edwardhartnett Apr 9, 2024
fbfcced
updated workflow
edwardhartnett Apr 9, 2024
b17dfc2
updated workflow
edwardhartnett Apr 9, 2024
c914d69
Merge pull request #28 from edwardhartnett/ejh_0405
edwardhartnett Apr 9, 2024
8d9e572
working on read code
edwardhartnett Apr 9, 2024
c944bef
fixed test_io call of read
edwardhartnett Apr 10, 2024
e7b5b1f
Merge pull request #30 from edwardhartnett/ejh_0410
edwardhartnett Apr 10, 2024
8a6a9d2
merged develop
edwardhartnett Apr 10, 2024
a2f4455
testing
edwardhartnett Apr 12, 2024
734556b
Merge pull request #34 from edwardhartnett/ejh_r3
edwardhartnett Apr 12, 2024
23bcebc
trying to cache regtest data
edwardhartnett Apr 12, 2024
2a5998d
fixing cache
edwardhartnett Apr 12, 2024
d8fd352
Merge pull request #35 from edwardhartnett/ejh_r4
edwardhartnett Apr 12, 2024
2e7e054
porting work
edwardhartnett Apr 12, 2024
58d1184
fixed code
edwardhartnett Apr 12, 2024
4bf279f
more unit tests
edwardhartnett Apr 12, 2024
c24877f
better error handling
edwardhartnett Apr 13, 2024
d3a9b05
better error handling
edwardhartnett Apr 13, 2024
35fb4e1
better error handling
edwardhartnett Apr 13, 2024
1f9e8c8
clean up regtest CI, revert change
edwardhartnett Apr 13, 2024
c196ee8
fixed error handling
edwardhartnett Apr 13, 2024
5fe8c3e
fixed comment
edwardhartnett Apr 13, 2024
9b414f9
Merge pull request #36 from edwardhartnett/ejh_r7
edwardhartnett Apr 13, 2024
54fb61e
cause run_cmake_test to return error if there is an error
edwardhartnett Apr 13, 2024
4c3030e
cause run_cmake_test to return error if there is an error
edwardhartnett Apr 14, 2024
b092daa
adding test_io3
edwardhartnett Apr 14, 2024
3aa1eb7
adding time dimension to read
edwardhartnett Apr 14, 2024
743a0e8
removing time dimension to read
edwardhartnett Apr 14, 2024
5b611d6
check for associated memory when reading
edwardhartnett Apr 14, 2024
a816d94
initializing point data arrays on read
edwardhartnett Apr 15, 2024
4a2c184
more changes
edwardhartnett Apr 15, 2024
7d9894f
successfully reading in variables now!
JessicaMeixner-NOAA Apr 15, 2024
a5dad0b
update read for time
JessicaMeixner-NOAA Apr 16, 2024
99f9e85
fixed inadvertant change
edwardhartnett Apr 16, 2024
1a1f16b
Merge pull request #37 from edwardhartnett/ejh_0413
edwardhartnett Apr 16, 2024
8fdf76f
add a flag to stop at end of file for netcdf point read
JessicaMeixner-NOAA Apr 16, 2024
19daa8e
small fix to make tp1.1 match develop
JessicaMeixner-NOAA Apr 16, 2024
9887cfc
clean up comments and print statements
JessicaMeixner-NOAA Apr 16, 2024
97a99bd
Merge remote-tracking branch 'EH/ejh_develop' into feature/pointbinar…
JessicaMeixner-NOAA Apr 17, 2024
aed792d
fix bug from merge
JessicaMeixner-NOAA Apr 17, 2024
f48d69c
updates for FLX5 and SETUP
JessicaMeixner-NOAA Apr 17, 2024
eb4bd30
fix build errors and a typo
JessicaMeixner-NOAA Apr 17, 2024
1e48775
clean up if statements
JessicaMeixner-NOAA Apr 17, 2024
2d0a0da
clean up test files
JessicaMeixner-NOAA Apr 17, 2024
8020f84
remove duplication of wiki page
JessicaMeixner-NOAA Apr 17, 2024
a8741f3
update error messages to use write statements and add line numbers
JessicaMeixner-NOAA Apr 18, 2024
2e7105f
update error messages to show line number for easier debugging
JessicaMeixner-NOAA Apr 18, 2024
fa4509b
fix for a few multi tests to run
JessicaMeixner-NOAA Apr 18, 2024
40fa419
some clean up
JessicaMeixner-NOAA May 2, 2024
4566f92
add a check on version numbers
JessicaMeixner-NOAA May 7, 2024
3f1db34
minor update
JessicaMeixner-NOAA May 8, 2024
bd4dbb3
test update to ci
JessicaMeixner-NOAA May 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
133 changes: 133 additions & 0 deletions .github/workflows/regtest_gnu.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: regtest_gnu
on: [push, pull_request, workflow_dispatch]

# Cancel in-progress workflows when pushing to a branch
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
cache_key: gnu11-1
CC: gcc-10
FC: gfortran-10
CXX: g++-10


# Split into a steup step, and a WW3 build step which
# builds multiple switches in a matrix. The setup is run once and
# the environment is cached so each build of WW3 can share the dependencies.

jobs:
setup:
runs-on: ubuntu-latest

steps:
- name: checkout-ww3
if: steps.cache-env.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
path: ww3
# Cache spack, OASIS, and compiler
# No way to flush Action cache, so key may have # appended
- name: cache-env
id: cache-env
uses: actions/cache@v3
with:
path: |
spack
~/.spack
work_oasis3-mct
key: spack-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack_gnu.yaml') }}

# Build WW3 spack environment
- name: install-dependencies-with-spack
if: steps.cache-env.outputs.cache-hit != 'true'
run: |
# Install NetCDF, ESMF, g2, etc using Spack
sudo apt install cmake
git clone -c feature.manyFiles=true https://github.com/JCSDA/spack.git
source spack/share/spack/setup-env.sh
spack env create ww3-gnu ww3/model/ci/spack_gnu.yaml
spack env activate ww3-gnu
spack compiler find
spack external find cmake
spack add mpich@3.4.2
spack concretize
spack install --dirty -v

- name: build-oasis
if: steps.cache-env.outputs.cache-hit != 'true'
run: |
source spack/share/spack/setup-env.sh
spack env activate ww3-gnu
export WWATCH3_DIR=${GITHUB_WORKSPACE}/ww3/model
export OASIS_INPUT_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/oasis3-mct
export OASIS_WORK_PATH=${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct
cd ww3/regtests/ww3_tp2.14/input/oasis3-mct/util/make_dir
cmake .
make VERBOSE=1
cp -r ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.14/input/work_oasis3-mct ${GITHUB_WORKSPACE}

regtest_gnu:
needs: setup
runs-on: ubuntu-latest

steps:
- name: install-dependencies
run: |
sudo apt-get update
sudo apt-get install doxygen gcovr valgrind

- name: checkout-ww3
uses: actions/checkout@v3
with:
path: ww3

- name: cache-env
id: cache-env
uses: actions/cache@v3
with:
path: |
spack
~/.spack
work_oasis3-mct
key: spack2-${{ runner.os }}-${{ env.cache_key }}-${{ hashFiles('ww3/model/ci/spack_gnu.yaml') }}

- name: build-ww3
run: |
source spack/share/spack/setup-env.sh
spack env activate ww3-gnu
set -x
cd ww3
export CC=mpicc
export FC=mpif90
export OASISDIR=${GITHUB_WORKSPACE}/work_oasis3-mct
# mkdir build && cd build
export LD_LIBRARY_PATH="/home/runner/work/WW3/WW3/spack/var/spack/environments/ww3-gnu/.spack-env/view/:$LD_LIBRARY_PATH"
# cmake -DSWITCH=${GITHUB_WORKSPACE}/ww3/regtests/unittests/data/switch.io -DCMAKE_BUILD_TYPE=Debug ..
# make -j2 VERBOSE=1
cd ${GITHUB_WORKSPACE}/ww3
ls -l
${GITHUB_WORKSPACE}/ww3/model/bin/ww3_from_ftp.sh -k
cd regtests
./bin/run_cmake_test -o all -S -T -s PR1_MPI -w work_PR1_MPI -f -p mpirun -n 24 ../model ww3_tp2.5
cd ww3_tp2.5
ls -l
cd work_PR1_MPI
pwd
ls -l
ncdump -h out_pnt.ww3.nc > ncdump_out.txt
cat ncdump_out.txt
pwd
cat ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt
cmp ${GITHUB_WORKSPACE}/ww3/regtests/ww3_tp2.5/out_pnt_ncdump.txt ncdump_out.txt

- name: cache-data
id: cache-data
uses: actions/cache@v3
with:
path: ww3/ww3_from_ftp.v7.14.1.tar.gz
key: ww3_from_ftp.v7.14.1



9 changes: 6 additions & 3 deletions model/bin/ww3_from_ftp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,14 @@ fi
#Move to top level directory of ww3:
cd $ww3dir

#Download from ftp and uptar:
echo -e "Downloading and untaring file from ftp:"
wget --no-check-certificate https://ftp.emc.ncep.noaa.gov/static_files/public/WW3/ww3_from_ftp.${ww3ver}.tar.gz
#Download from ftp (if not already present) and uptar:
echo -e "Downloading (or finding) and untaring file from ftp:"
if ! test -f ww3_from_ftp.${ww3ver}.tar.gz; then
wget --no-check-certificate https://ftp.emc.ncep.noaa.gov/static_files/public/WW3/ww3_from_ftp.${ww3ver}.tar.gz
fi
tar -xvzf ww3_from_ftp.${ww3ver}.tar.gz


#Move regtest info from data_regtests to regtests:
echo -e "Moving data from data_regtests to regtests"
cp -r data_regtests/ww3_tp2.18/input/*.nc regtests/ww3_tp2.18/input/
Expand Down
10 changes: 7 additions & 3 deletions model/src/gx_outp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,11 @@ PROGRAM GXOUTP
#endif
USE W3ODATMD, ONLY: W3SETO, W3NOUT
USE W3IOGRMD, ONLY: W3IOGR
USE W3IOPOMD, ONLY: W3IOPO
!!!MTM
!!!USE W3IOPOMD, ONLY: W3IOPO
USE W3IOPOMD
USE netcdf

USE W3SERVMD, ONLY : ITRACE, NEXTLN, EXTCDE
#ifdef W3_S
USE W3SERVMD, ONLY : STRACE
Expand Down Expand Up @@ -277,7 +281,7 @@ PROGRAM GXOUTP
!--- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
! 3. Read general data and first fields from file
!
CALL W3IOPO ( 'READ', NDSOP, IOTEST )
CALL W3IOPON ( 'READ', NDSOP, IOTEST )
ALLOCATE ( FLREQ(NOPTS) )
!
WRITE (NDSO,930)
Expand Down Expand Up @@ -369,7 +373,7 @@ PROGRAM GXOUTP
DO
DTEST = DSEC21 ( TIME , TOUT )
IF ( DTEST .GT. 0. ) THEN
CALL W3IOPO ( 'READ', NDSOP, IOTEST )
CALL W3IOPON ( 'READ', NDSOP, IOTEST )
IF ( IOTEST .EQ. -1 ) THEN
WRITE (NDSO,998)
EXIT
Expand Down
Loading
Loading