diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e33e36d8794e763a95051a8bfc9441fe606538b2..24a87265b60e3188af7c525164f1e0e87d9f0d66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ compatibility_stage: - mkdir build_gnu14_refine - cd build_gnu14_refine - cp -r ../build/* . - - CXX=g++-14 F77=gfortran-14 ./configure --with-refinement + - CXX=g++-14 F77=gfortran-14 ./configure --enable-refinement - make clean - make -j - echo "Running make with flang version 16 and clang version 16..." @@ -134,6 +134,7 @@ building_stage: artifacts: paths: - build/cluster/* + - build/inclusion/* - build/sphere/* - build/testing/* - build/trapping/* @@ -153,7 +154,7 @@ building_stage: - cat /etc/os-release - cd build - echo "Configuring with default compilers (MAGMA disabled)..." - - ./configure --without-magma --disable-offload --with-refinement + - ./configure --without-magma --disable-offload --enable-refinement - make clean - echo "Building the default configuration..." - make -j @@ -201,6 +202,7 @@ running_stage: artifacts: paths: - build/cluster/c_* + - build/inclusion/c_* - build/sphere/c_* #- build/trapping/* exclude: @@ -221,6 +223,10 @@ running_stage: - echo "Running np_cluster" - chmod +x np_cluster - OMP_NUM_THREADS=1 ./np_cluster + - cd ../inclusion + - echo "Running np_inclusion" + - chmod +x np_inclusion + - OMP_NUM_THREADS=1 ./np_inclusion testing_stage: stage: test @@ -235,6 +241,7 @@ testing_stage: artifacts: paths: - build/cluster/pycompare.html + - build/inclusion/pycompare.html - build/sphere/pycompare.html exclude: - ".git*" @@ -252,6 +259,10 @@ testing_stage: - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OSPH --html - echo "Checking consistency among legacy and HDF5 configuration files" - ../testing/test_TEDF ../../test_data/sphere/DEDFB c_TEDF c_TEDF.hd5 + - cd ../inclusion + - echo "Comparing output of INCLUSION" + - export FFILE=../../test_data/inclusion/OINCLU + - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OINCLU --html - cd ../cluster - echo "Comparing output of CLUSTER" - export FFILE=../../test_data/cluster/OCLU