Commit 14e2be39 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'HOTFIX_fortranTest' into 'master' 

Fixes failures due to changing sig figs

See merge request neams/saline!9
parents 5f35d77b 010049b5

.gitlab-ci.yml

+13 −19
Original line number Diff line number Diff line 
variables:

  GIT_SUBMODULE_STRATEGY: normal

stages:

- test



before_script:

  - if [[ -f "/data/test_gcc/gcc-8.3.0/load_dev_env.sh" ]]; then BASE_DIR="/data/gitlab-runner"; . /data/test_gcc/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/data/test_gcc/gcc-8.3.0; else BASE_DIR="/localhome/gitlab-runner"; . /projects/vera/gcc-8.3.0/load_dev_env.sh; ENV_BASE=/projects/vera/gcc-8.3.0; fi



.stage_artifacts: &stage_artifacts

  artifacts:

    paths:
@@ -9,11 +13,7 @@ variables: 
      - testframework/

    expire_in: 1 day



stages:

- test

- analysis



linux_gcc485_testing:

linux_gcc83_testing:

  stage: test

  tags:

    - linux
@@ -21,15 +21,9 @@ linux_gcc485_testing: 
  script:

    - git clone https://github.com/lefebvre/TriBITS.git TriBITS

    - ./TriBITS/tribits/ci_support/clone_extra_repos.py 

    - ci/linux_gcc_test.sh



linux_gcc_analysis:

  stage: analysis

  tags:

    - linux

    - valgrind

  script:

    - git clone https://github.com/lefebvre/TriBITS.git TriBITS

    - ./TriBITS/tribits/ci_support/clone_extra_repos.py

    - ci/linux_gcc_analysis.sh

  allow_failure: true
 
    - SRC_DIR=`pwd`

    - BLD_DIR="/tmp/$CI_PIPELINE_ID/$BLD_NAME"

    - mkdir -p $BLD_DIR

    - cd $BLD_DIR

    - rm -rf *

    - $SRC_DIR/ci/linux_gcc83_test.sh $SRC_DIR

ci/linux_gcc83_test.sh

0 → 100755
+17 −0
Original line number Diff line number Diff line 
#!/bin/bash



export saline_ENABLE_Fortran=ON # Enable the Fortran library and bindings

cmake -DBUILDNAME="$(uname -s)-Release-${CI_BUILD_REF_NAME}" \

      -DCMAKE_BUILD_TYPE=RELEASE \

      -Dsaline_ENABLE_TESTS=ON \

      -DBUILD_SHARED_LIBS:BOOL=ON \

      -Dsaline_ENABLE_ALL_PACKAGES=ON \

      -Dsaline_ENABLE_salinepython:BOOL=FALSE \

      $1



ctest --output-on-failure \

      -D ExperimentalStart \

      -D ExperimentalBuild -j 8\

      -D ExperimentalSubmit \

      -D ExperimentalTest -j 8 \

      -D ExperimentalSubmit

fortran/tests/tstthermophysical_properties.f90

+3 −3
Original line number Diff line number Diff line
@@ -31,14 +31,14 @@ contains 
    endif

    

    print *,tp%mu(926.00_8, 101.0_8)

    if ( tp%mu(926.00_8, 101.0_8) /= 7.4798896290598522_8) then

    if ( tp%mu(926.00_8, 101.0_8) /= 7.4825131826198357_8) then

      print *,"Failed to equate values!"

      stop 2

    endif



    if ( tp%rho(926.00_8, 101.0_8) * 1000.0 /= tp%rho_kgm3(926.00_8,101.0_8)) then

      print *,"Failed to equate values!"

      stop 2

      stop 3

    endif

    

    call tp%destroy()
@@ -65,7 +65,7 @@ contains 
    endif

    

    print *,tp%rho(850.0_8, 101.0_8)

    if ( tp%rho(850.0_8, 101.0_8) /= 2.0407662634789121_8 ) then

    if ( tp%rho(850.0_8, 101.0_8) /= 2.0406762757251267_8 ) then

      print *,"Failed to equate values!"

      stop 2

    endif