Loading .gitlab-ci.yml +12 −1 Original line number Original line Diff line number Diff line Loading @@ -242,7 +242,7 @@ running_stage: - build/inclusion/D* - build/inclusion/D* - build/sphere/c_* - build/sphere/c_* - build/sphere/D* - build/sphere/D* #- build/trapping/* - build/trapping/c_* exclude: exclude: - ".git*" - ".git*" - ".git/**/*" - ".git/**/*" Loading Loading @@ -281,6 +281,11 @@ running_stage: - echo "Running np_inclusion" - echo "Running np_inclusion" - chmod +x np_inclusion - chmod +x np_inclusion - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU . - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU . - cd ../trapping - echo "Running np_trapping" - chmod +x np_trapping - OMP_NUM_THREADS=1 ../sphere/np_sphere ../../test_data/trapping/DEDFB ../../test_data/trapping/DSPH . - ./np_trapping ../../test_data/trapping/DFRFME ../../test_data/trapping/DLFFFT . testing_stage: testing_stage: stage: test stage: test Loading Loading @@ -358,4 +363,10 @@ testing_stage: - export FFILE=../../test_data/sphere/OSPH - export FFILE=../../test_data/sphere/OSPH - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH - rm -rf c_OSPH - rm -rf c_OSPH - echo "Comparing output of TRAPPING" - cd ../trapping - export FFILE=../../test_data/trapping/fort.66 - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_force_cs.txt - export FFILE=../../test_data/trapping/fort.67 - python3 ../../src/scripts/pycompare.py --no-progress --data-order=-10 --ffile $FFILE --cfile c_torque_cs.txt No newline at end of file Loading
.gitlab-ci.yml +12 −1 Original line number Original line Diff line number Diff line Loading @@ -242,7 +242,7 @@ running_stage: - build/inclusion/D* - build/inclusion/D* - build/sphere/c_* - build/sphere/c_* - build/sphere/D* - build/sphere/D* #- build/trapping/* - build/trapping/c_* exclude: exclude: - ".git*" - ".git*" - ".git/**/*" - ".git/**/*" Loading Loading @@ -281,6 +281,11 @@ running_stage: - echo "Running np_inclusion" - echo "Running np_inclusion" - chmod +x np_inclusion - chmod +x np_inclusion - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU . - OMP_NUM_THREADS=1 ./np_inclusion DEDFB DINCLU . - cd ../trapping - echo "Running np_trapping" - chmod +x np_trapping - OMP_NUM_THREADS=1 ../sphere/np_sphere ../../test_data/trapping/DEDFB ../../test_data/trapping/DSPH . - ./np_trapping ../../test_data/trapping/DFRFME ../../test_data/trapping/DLFFFT . testing_stage: testing_stage: stage: test stage: test Loading Loading @@ -358,4 +363,10 @@ testing_stage: - export FFILE=../../test_data/sphere/OSPH - export FFILE=../../test_data/sphere/OSPH - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH - rm -rf c_OSPH - rm -rf c_OSPH - echo "Comparing output of TRAPPING" - cd ../trapping - export FFILE=../../test_data/trapping/fort.66 - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_force_cs.txt - export FFILE=../../test_data/trapping/fort.67 - python3 ../../src/scripts/pycompare.py --no-progress --data-order=-10 --ffile $FFILE --cfile c_torque_cs.txt No newline at end of file