Replaced all occurrences of PICLAS_PETSC with LIBS_USE_PETSC

scopplestone · Jul 24, 2024 · 0afdbd9 · 0afdbd9
1 parent b22860d
commit 0afdbd9
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 27 deletions.
diff --git a/.github/workflows/cmake-ninja.yml b/.github/workflows/cmake-ninja.yml
@@ -230,8 +230,8 @@ jobs:
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
       run: |
         source ~/.bashrc
-        cmake -G Ninja -B build_poisson_leapfrog -DPICLAS_INSTRUCTION=-mtune=generic -DPOSTI_BUILD_PICLAS2VTK=OFF -DPOSTI_BUILD_SUPERB=OFF -DPICLAS_TIMEDISCMETHOD=Leapfrog -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=ON -DCMAKE_BUILD_TYPE=Release -DLIBS_USE_MPI=ON -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON -DCMAKE_INSTALL_PREFIX=/usr
-        #cmake -G Ninja -B build_poisson_leapfrog -DPICLAS_INSTRUCTION=-mtune=generic -DPOSTI_BUILD_PICLAS2VTK=OFF -DPOSTI_BUILD_SUPERB=OFF -DPICLAS_TIMEDISCMETHOD=Leapfrog -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=OFF -DCMAKE_BUILD_TYPE=Release -DLIBS_USE_MPI=ON -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON -DCMAKE_INSTALL_PREFIX=/usr
+        cmake -G Ninja -B build_poisson_leapfrog -DPICLAS_INSTRUCTION=-mtune=generic -DPOSTI_BUILD_PICLAS2VTK=OFF -DPOSTI_BUILD_SUPERB=OFF -DPICLAS_TIMEDISCMETHOD=Leapfrog -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=ON -DCMAKE_BUILD_TYPE=Release -DLIBS_USE_MPI=ON -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON -DCMAKE_INSTALL_PREFIX=/usr
+        #cmake -G Ninja -B build_poisson_leapfrog -DPICLAS_INSTRUCTION=-mtune=generic -DPOSTI_BUILD_PICLAS2VTK=OFF -DPOSTI_BUILD_SUPERB=OFF -DPICLAS_TIMEDISCMETHOD=Leapfrog -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=OFF -DCMAKE_BUILD_TYPE=Release -DLIBS_USE_MPI=ON -DLIBS_BUILD_HDF5=OFF -DPICLAS_READIN_CONSTANTS=ON -DCMAKE_INSTALL_PREFIX=/usr
 
     - name: Build Piclas Poisson Leapfrog
       shell: bash

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -419,16 +419,16 @@ build_poisson_petsc:
   stage: build
   script:
     - mkdir -p build_poisson_petsc_release_RK3 ; cd build_poisson_petsc_release_RK3
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
     - cd ..
     - mkdir -p build_poisson_petsc_debug_RK3 ; cd build_poisson_petsc_debug_RK3
-    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
+    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
     - cd ..
     - mkdir -p build_poisson_petsc_release_Leapfrog ; cd build_poisson_petsc_release_Leapfrog
-    - cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=Leapfrog -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
+    - cmake .. -DCMAKE_BUILD_TYPE=Release -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=Leapfrog -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
     - cd ..
     - mkdir -p build_poisson_petsc_debug_Leapfrog ; cd build_poisson_petsc_debug_Leapfrog
-    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DPICLAS_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=Leapfrog -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
+    - cmake .. -DCMAKE_BUILD_TYPE=Debug -DPICLAS_EQNSYSNAME=poisson -DLIBS_USE_PETSC=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_TIMEDISCMETHOD=Leapfrog -DLIBS_BUILD_HDF5=OFF ; $GENERATOR -j $NCORES all
     - cd ..
 
 build_DSMC:

diff --git a/docs/documentation/developerguide/reggie.md b/docs/documentation/developerguide/reggie.md
@@ -62,20 +62,20 @@ developed code, the [reggie2.0](https://github.com/piclas-framework/reggie2.0) t
         PICLAS_NODETYPE ......................... GAUSS
         PICLAS_PARTICLES ........................ ON,OFF
         PICLAS_CODE_ANALYZE ..................... ON,OFF
-        PICLAS_PETSC ............................ OFF,ON
+        LIBS_USE_PETSC .......................... OFF,ON
 
        Select the first set of options via
 
-       cmake ..  -DCMAKE_BUILD_TYPE=Debug -DLIBS_BUILD_HDF5=OFF -DPICLAS_POLYNOMIAL_DEGREE=N -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_USE_MPI=ON -DPICLAS_NODETYPE=GAUSS -DPICLAS_PARTICLES=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_PETSC=OFF
+       cmake ..  -DCMAKE_BUILD_TYPE=Debug -DLIBS_BUILD_HDF5=OFF -DPICLAS_POLYNOMIAL_DEGREE=N -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_USE_MPI=ON -DPICLAS_NODETYPE=GAUSS -DPICLAS_PARTICLES=ON -DPICLAS_CODE_ANALYZE=ON -DLIBS_USE_PETSC=OFF
 
    The last line can directly be copied into the terminal within a build directory to generate the make files for compiling PICLas with the
    first set of parameter options given in the *builds.ini* file (ignoring the *nocrosscombination* statements).
    Simply adjust the last line to have the correct flags set, execute *cmake* in the *build* directory and run *make* to compile:
 
-       cmake ..  -DCMAKE_BUILD_TYPE=Debug -DLIBS_BUILD_HDF5=OFF -DPICLAS_POLYNOMIAL_DEGREE=N -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_USE_MPI=ON -DPICLAS_NODETYPE=GAUSS -DPICLAS_PARTICLES=ON -DPICLAS_CODE_ANALYZE=ON -DPICLAS_PETSC=ON
+       cmake ..  -DCMAKE_BUILD_TYPE=Debug -DLIBS_BUILD_HDF5=OFF -DPICLAS_POLYNOMIAL_DEGREE=N -DPICLAS_EQNSYSNAME=poisson -DPICLAS_TIMEDISCMETHOD=RK3 -DLIBS_USE_MPI=ON -DPICLAS_NODETYPE=GAUSS -DPICLAS_PARTICLES=ON -DPICLAS_CODE_ANALYZE=ON -DLIBS_USE_PETSC=ON
        make -j
 
-   Note that `-DPICLAS_PETSC=ON` has been adjusted in the above command.
+   Note that `-DLIBS_USE_PETSC=ON` has been adjusted in the above command.
    This will compile the *piclas* executable and it will be placed in the current directory under *bin*.
    Important note: Some regression tests build the hopr meshes "on-the-fly", hence, the *hopr* executable is required additionally.
    There are different possibilities to supply the *hopr* executable that is required:

diff --git a/regressioncheck/CHE_poisson_periodic/builds.ini b/regressioncheck/CHE_poisson_periodic/builds.ini
@@ -8,7 +8,7 @@ PICLAS_POLYNOMIAL_DEGREE = N
 PICLAS_EQNSYSNAME        = poisson
 PICLAS_PARTICLES         = OFF
 PICLAS_TIMEDISCMETHOD    = RK3
-PICLAS_PETSC             = OFF,ON
+LIBS_USE_PETSC             = OFF,ON
 LIBS_USE_MPI             = ON
 PICLAS_NODETYPE          = GAUSS
 PICLAS_CODE_ANALYZE      = ON

diff --git a/regressioncheck/NIG_IntKind8/builds.ini b/regressioncheck/NIG_IntKind8/builds.ini
@@ -7,14 +7,14 @@ LIBS_BUILD_HDF5          = OFF
 PICLAS_POLYNOMIAL_DEGREE = N
 PICLAS_EQNSYSNAME        = maxwell , maxwell , poisson  , poisson
 PICLAS_TIMEDISCMETHOD    = DSMC    , RK4     , Leapfrog , Boris-Leapfrog
-!PICLAS_PETSC             = OFF     , OFF     , OFF      , ON ! This used to test if petsc compiles with INT8 but if the code actually runs is untested
-PICLAS_PETSC             = OFF     , OFF     , OFF      , OFF
+!LIBS_USE_PETSC           = OFF     , OFF     , OFF      , ON ! This used to test if petsc compiles with INT8 but if the code actually runs is untested
+LIBS_USE_PETSC           = OFF     , OFF     , OFF      , OFF
 LIBS_USE_MPI             = ON
 PICLAS_NODETYPE          = GAUSS
 PICLAS_INTKIND8          = ON
 
 ! no cross
-nocrosscombination:PICLAS_EQNSYSNAME,PICLAS_TIMEDISCMETHOD,PICLAS_PETSC
+nocrosscombination:PICLAS_EQNSYSNAME,PICLAS_TIMEDISCMETHOD,LIBS_USE_PETSC
 
 ! exclude combinations
 EXCLUDE:PICLAS_EQNSYSNAME=poisson,PICLAS_TIMEDISCMETHOD=DSMC

diff --git a/regressioncheck/NIG_PIC_poisson_Boris-Leapfrog_PETSC/builds.ini b/regressioncheck/NIG_PIC_poisson_Boris-Leapfrog_PETSC/builds.ini
@@ -9,4 +9,4 @@ PICLAS_EQNSYSNAME        = poisson
 PICLAS_TIMEDISCMETHOD    = Boris-Leapfrog
 LIBS_USE_MPI             = ON
 PICLAS_NODETYPE          = GAUSS
-PICLAS_PETSC             = ON
+LIBS_USE_PETSC           = ON
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_AC/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_AC/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE-I/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE-I/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Dunaevsky2003/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Dunaevsky2003/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Morozov2004/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Morozov2004/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Phelps1999/excludeBuild.ini b/regressioncheck/NIG_PIC_poisson_Leapfrog/parallel_plates_SEE_Phelps1999/excludeBuild.ini
@@ -1,3 +1,3 @@
 ! Do not run this example with PETSC
-PICLAS_PETSC=ON
+LIBS_USE_PETSC=ON
 
diff --git a/regressioncheck/NIG_convtest_poisson/Dielectric_slab_FPC/excludeBuild.ini b/regressioncheck/NIG_convtest_poisson/Dielectric_slab_FPC/excludeBuild.ini
@@ -2,5 +2,5 @@
 PICLAS_PARTICLES    = OFF
 ! run only with PICLAS_CODE_ANALYZE = ON
 PICLAS_CODE_ANALYZE = OFF
-! run only with PICLAS_PETSC = ON
-PICLAS_PETSC        = OFF
+! run only with LIBS_USE_PETSC = ON
+LIBS_USE_PETSC      = OFF
diff --git a/regressioncheck/NIG_convtest_poisson/Laplace_h_N1_mortar/excludeBuild.ini b/regressioncheck/NIG_convtest_poisson/Laplace_h_N1_mortar/excludeBuild.ini
@@ -1,2 +1,2 @@
-! run only with PICLAS_PETSC = OFF
-PICLAS_PETSC = ON
+! run only with LIBS_USE_PETSC = OFF
+LIBS_USE_PETSC = ON
diff --git a/regressioncheck/NIG_convtest_poisson/builds.ini b/regressioncheck/NIG_convtest_poisson/builds.ini
@@ -11,4 +11,4 @@ LIBS_USE_MPI             = ON
 PICLAS_NODETYPE          = GAUSS
 PICLAS_PARTICLES         = ON,OFF
 PICLAS_CODE_ANALYZE      = ON,OFF
-PICLAS_PETSC             = ON,OFF
+LIBS_USE_PETSC           = ON,OFF
diff --git a/regressioncheck/NIG_poisson_PETSC/builds.ini b/regressioncheck/NIG_poisson_PETSC/builds.ini
@@ -9,7 +9,7 @@ PICLAS_TIMEDISCMETHOD    = RK3
 LIBS_USE_MPI             = ON
 PICLAS_NODETYPE          = GAUSS
 PICLAS_CODE_ANALYZE      = ON ! is required for ./CHE_poisson/poisson_box_Dirichlet
-PICLAS_PETSC             = ON
+LIBS_USE_PETSC           = ON
 PICLAS_POLYNOMIAL_DEGREE = N  , 1
 PICLAS_PARTICLES         = ON , OFF