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

New Testsuite #464

Merged
merged 4 commits into from
Jan 10, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 13 additions & 13 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI

# Controls when the action will run.
# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
pull_request:
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
os: [ubuntu-latest, macos-10.15]
fortran: [8, 9]

# Steps represent a sequence of tasks that will be executed as part of the job
Expand All @@ -35,7 +35,7 @@ jobs:
# Install gfortran 8 since both Ubuntu and macOS don't supply it
# macOS only
- name: Install gfortran-8 on macOS
if: matrix.os == 'macos-latest' && matrix.fortran == 8
if: matrix.os == 'macos-10.15' && matrix.fortran == 8
run: brew install gcc@8

# ubuntu only
Expand All @@ -51,17 +51,17 @@ jobs:

# macOS only
- name: Install cvode (macOS)
if: matrix.os == 'macos-latest'
if: matrix.os == 'macos-10.15'
run: ./tools/install/install_cvode.sh $PWD $(which gfortran-${{ matrix.fortran }})

# Install all dependencies
# both OSs
- name: Install openlibm
run: ./tools/install/install_openlibm.sh $PWD

- name: Install numdiff
run: ./tools/install/install_numdiff.sh $PWD

- name: Install fruit
run: sudo ./tools/install/install_fruit.sh $PWD

Expand All @@ -73,13 +73,13 @@ jobs:
run: |
cp tools/install/Makefile.skel Makefile
./build/build_atchem2.sh ./mcm/mechanism_test.fac
if [ $RUNNER_OS != 'Linux' ] ; then
install_name_tool -change libopenlibm.dylib.1 $PWD/openlibm-0.4.1/libopenlibm.dylib.1 atchem2 ;
install_name_tool -change @rpath/libsundials_cvode.2.dylib $PWD/cvode/lib/libsundials_cvode.dylib atchem2 ;
install_name_tool -change @rpath/libsundials_fnvecserial.2.dylib $PWD/cvode/lib/libsundials_fnvecserial.dylib atchem2 ;
if [ $RUNNER_OS != 'Linux' ] ; then
install_name_tool -change libopenlibm.dylib.1 $PWD/openlibm-0.4.1/libopenlibm.dylib.1 atchem2 ;
install_name_tool -change @rpath/libsundials_cvode.2.dylib $PWD/cvode/lib/libsundials_cvode.dylib atchem2 ;
install_name_tool -change @rpath/libsundials_fnvecserial.2.dylib $PWD/cvode/lib/libsundials_fnvecserial.dylib atchem2 ;
install_name_tool -change @rpath/libsundials_nvecserial.2.dylib $PWD/cvode/lib/libsundials_nvecserial.dylib atchem2 ;
fi

- name: Indent and style tests
run: |
make indenttest
Expand All @@ -91,7 +91,7 @@ jobs:
./atchem2
# Upload 'build' coverage to codecov
if [[ "$RUNNER_OS" == "Linux" ]]; then sudo ln -f -s /usr/bin/gcov-${{ matrix.fortran }} /usr/bin/gcov ; bash <(curl -s https://codecov.io/bash) -F build ; fi

- name: Run tests
# Set FORT_VERSION for use inside the Makefile
env:
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion test/run_indent_test.sh → tests/run_indent_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# that they conform to the coding guidelines, described in the manual
# (doc/AtChem2-Manual.pdf)

RESULTS_FILE=test/tests/testsuite.log
RESULTS_FILE=tests/tests/testsuite.log

echo "Running indent script on:"
for file in src/*.f90 ; do
Expand Down
2 changes: 1 addition & 1 deletion test/run_style_test.sh → tests/run_style_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# that they conform to the coding guidelines, described in the manual
# (doc/AtChem2-Manual.pdf)

RESULTS_FILE=test/tests/testsuite.log
RESULTS_FILE=tests/tests/testsuite.log

echo "Running style script on:"
for file in src/*.f90 ; do
Expand Down
6 changes: 3 additions & 3 deletions test/run_tests.sh → tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ function test_output_text {
# $3 start line number of section to compare
# $4 end line number of section to compare
# $5 name of test
file1=test/tests/$5/output/temporary_file.tmp
file2=test/tests/$5/output/temporary_file.tmp.cmp
file1=tests/tests/$5/output/temporary_file.tmp
file2=tests/tests/$5/output/temporary_file.tmp.cmp
ndselect -b $3 -e $4 -o $file1 $1
ndselect -b $3 -e $4 -o $file2 $2
# Save output of test_output_file
Expand Down Expand Up @@ -62,7 +62,7 @@ function find_string {
# $skip_test. This requires extra machinery to handle splitting the file into
# sections between the skipped lines, and to numdiff those sections.

TESTS_DIR=test/tests
TESTS_DIR=tests/tests
RESULTS_FILE=$TESTS_DIR/testsuite.log
export DYLD_LIBRARY_PATH=$2

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/firstorder/output
Reaction Rates directory is: test/tests/firstorder/output/reactionRates
Configuration directory is: test/tests/firstorder/model/configuration
Constraints directory is: test/tests/firstorder/model/constraints
Environment Constraints directory is: test/tests/firstorder/model/constraints/environment
Photolysis Constraints directory is: test/tests/firstorder/model/constraints/photolysis
Species Constraints directory is: test/tests/firstorder/model/constraints/species
Output directory is: tests/tests/firstorder/output
Reaction Rates directory is: tests/tests/firstorder/output/reactionRates
Configuration directory is: tests/tests/firstorder/model/configuration
Constraints directory is: tests/tests/firstorder/model/constraints
Environment Constraints directory is: tests/tests/firstorder/model/constraints/environment
Photolysis Constraints directory is: tests/tests/firstorder/model/constraints/photolysis
Species Constraints directory is: tests/tests/firstorder/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/firstorder/model/configuration/mechanism.so
Shared library is: tests/tests/firstorder/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/secondorder/output
Reaction Rates directory is: test/tests/secondorder/output/reactionRates
Configuration directory is: test/tests/secondorder/model/configuration
Constraints directory is: test/tests/secondorder/model/constraints
Environment Constraints directory is: test/tests/secondorder/model/constraints/environment
Photolysis Constraints directory is: test/tests/secondorder/model/constraints/photolysis
Species Constraints directory is: test/tests/secondorder/model/constraints/species
Output directory is: tests/tests/secondorder/output
Reaction Rates directory is: tests/tests/secondorder/output/reactionRates
Configuration directory is: tests/tests/secondorder/model/configuration
Constraints directory is: tests/tests/secondorder/model/constraints
Environment Constraints directory is: tests/tests/secondorder/model/constraints/environment
Photolysis Constraints directory is: tests/tests/secondorder/model/constraints/photolysis
Species Constraints directory is: tests/tests/secondorder/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/secondorder/model/configuration/mechanism.so
Shared library is: tests/tests/secondorder/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short/output
Reaction Rates directory is: test/tests/short/output/reactionRates
Configuration directory is: test/tests/short/model/configuration
Constraints directory is: test/tests/short/model/constraints
Environment Constraints directory is: test/tests/short/model/constraints/environment
Photolysis Constraints directory is: test/tests/short/model/constraints/photolysis
Species Constraints directory is: test/tests/short/model/constraints/species
Output directory is: tests/tests/short/output
Reaction Rates directory is: tests/tests/short/output/reactionRates
Configuration directory is: tests/tests/short/model/configuration
Constraints directory is: tests/tests/short/model/constraints
Environment Constraints directory is: tests/tests/short/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short/model/constraints/photolysis
Species Constraints directory is: tests/tests/short/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short/model/configuration/mechanism.so
Shared library is: tests/tests/short/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_dense/output
Reaction Rates directory is: test/tests/short_dense/output/reactionRates
Configuration directory is: test/tests/short_dense/model/configuration
Constraints directory is: test/tests/short_dense/model/constraints
Environment Constraints directory is: test/tests/short_dense/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_dense/model/constraints/photolysis
Species Constraints directory is: test/tests/short_dense/model/constraints/species
Output directory is: tests/tests/short_dense/output
Reaction Rates directory is: tests/tests/short_dense/output/reactionRates
Configuration directory is: tests/tests/short_dense/model/configuration
Constraints directory is: tests/tests/short_dense/model/constraints
Environment Constraints directory is: tests/tests/short_dense/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_dense/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_dense/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_dense/model/configuration/mechanism.so
Shared library is: tests/tests/short_dense/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_end_of_day/output
Reaction Rates directory is: test/tests/short_end_of_day/output/reactionRates
Configuration directory is: test/tests/short_end_of_day/model/configuration
Constraints directory is: test/tests/short_end_of_day/model/constraints
Environment Constraints directory is: test/tests/short_end_of_day/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_end_of_day/model/constraints/photolysis
Species Constraints directory is: test/tests/short_end_of_day/model/constraints/species
Output directory is: tests/tests/short_end_of_day/output
Reaction Rates directory is: tests/tests/short_end_of_day/output/reactionRates
Configuration directory is: tests/tests/short_end_of_day/model/configuration
Constraints directory is: tests/tests/short_end_of_day/model/constraints
Environment Constraints directory is: tests/tests/short_end_of_day/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_end_of_day/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_end_of_day/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_end_of_day/model/configuration/mechanism.so
Shared library is: tests/tests/short_end_of_day/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_ext1/output
Reaction Rates directory is: test/tests/short_ext1/output/reactionRates
Configuration directory is: test/tests/short_ext1/model/configuration
Constraints directory is: test/tests/short_ext1/model/constraints
Environment Constraints directory is: test/tests/short_ext1/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_ext1/model/constraints/photolysis
Species Constraints directory is: test/tests/short_ext1/model/constraints/species
Output directory is: tests/tests/short_ext1/output
Reaction Rates directory is: tests/tests/short_ext1/output/reactionRates
Configuration directory is: tests/tests/short_ext1/model/configuration
Constraints directory is: tests/tests/short_ext1/model/constraints
Environment Constraints directory is: tests/tests/short_ext1/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_ext1/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_ext1/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_ext1/model/configuration/mechanism.so
Shared library is: tests/tests/short_ext1/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_ext2/output
Reaction Rates directory is: test/tests/short_ext2/output/reactionRates
Configuration directory is: test/tests/short_ext2/model/configuration
Constraints directory is: test/tests/short_ext2/model/constraints
Environment Constraints directory is: test/tests/short_ext2/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_ext2/model/constraints/photolysis
Species Constraints directory is: test/tests/short_ext2/model/constraints/species
Output directory is: tests/tests/short_ext2/output
Reaction Rates directory is: tests/tests/short_ext2/output/reactionRates
Configuration directory is: tests/tests/short_ext2/model/configuration
Constraints directory is: tests/tests/short_ext2/model/constraints
Environment Constraints directory is: tests/tests/short_ext2/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_ext2/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_ext2/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_ext2/model/configuration/mechanism.so
Shared library is: tests/tests/short_ext2/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_ext3/output
Reaction Rates directory is: test/tests/short_ext3/output/reactionRates
Configuration directory is: test/tests/short_ext3/model/configuration
Constraints directory is: test/tests/short_ext3/model/constraints
Environment Constraints directory is: test/tests/short_ext3/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_ext3/model/constraints/photolysis
Species Constraints directory is: test/tests/short_ext3/model/constraints/species
Output directory is: tests/tests/short_ext3/output
Reaction Rates directory is: tests/tests/short_ext3/output/reactionRates
Configuration directory is: tests/tests/short_ext3/model/configuration
Constraints directory is: tests/tests/short_ext3/model/constraints
Environment Constraints directory is: tests/tests/short_ext3/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_ext3/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_ext3/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_ext3/model/configuration/mechanism.so
Shared library is: tests/tests/short_ext3/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ AtChem2 v1.3-dev
Directories
-------------
Model directory is: model
Output directory is: test/tests/short_ext4/output
Reaction Rates directory is: test/tests/short_ext4/output/reactionRates
Configuration directory is: test/tests/short_ext4/model/configuration
Constraints directory is: test/tests/short_ext4/model/constraints
Environment Constraints directory is: test/tests/short_ext4/model/constraints/environment
Photolysis Constraints directory is: test/tests/short_ext4/model/constraints/photolysis
Species Constraints directory is: test/tests/short_ext4/model/constraints/species
Output directory is: tests/tests/short_ext4/output
Reaction Rates directory is: tests/tests/short_ext4/output/reactionRates
Configuration directory is: tests/tests/short_ext4/model/configuration
Constraints directory is: tests/tests/short_ext4/model/constraints
Environment Constraints directory is: tests/tests/short_ext4/model/constraints/environment
Photolysis Constraints directory is: tests/tests/short_ext4/model/constraints/photolysis
Species Constraints directory is: tests/tests/short_ext4/model/constraints/species
MCM directory is: mcm
Shared library is: test/tests/short_ext4/model/configuration/mechanism.so
Shared library is: tests/tests/short_ext4/model/configuration/mechanism.so

-----------------------
Species and reactions
Expand Down
Loading