small corrections in ellipt problem

contrib/ci-setup

@@ -14,10 +14,10 @@ if [ ! -d install/MTL ]; then
    cd ${root}
 fi
 
-if [ ! -d install/gtest ]; then
-   mkdir -p install/gtest
-   cd install/gtest
-   cmake -DCMAKE_INSTALL_PREFIX=${root}/install/gtest /usr/src/gtest
-   make
-   cd ${root}
-fi
+# if [ ! -d install/gtest ]; then
+#    mkdir -p install/gtest
+#    cd install/gtest
+#    cmake -DCMAKE_INSTALL_PREFIX=${root}/install/gtest /usr/src/gtest
+#    make
+#    cd ${root}
+# fi

init/ellipt.json.3d

+{
+  "dimension of world":             3,
+
+  "elliptMesh": {
+    "macro file name":    "./macro/macro.stand.3d",
+    "global refinements": 0
+  },
+
+  "ellipt": {
+    "mesh":  "elliptMesh",
+    "names": "u",
+ 
+    "solver" : {
+      "name":               "cg",
+      "max iteration":      1000,
+      "absolute tolerance": 1e-6,
+      "info":               1,
+      "left precon":        "diag"
+    },
+
+    "output": {
+      "filename":         "output/ellipt.3d",
+      "output directory": "output"
+    }
+  }
+}

src/CMakeLists.txt

 
-set(projects2d "ellipt" "heat" "pfc" "stokes" "navier_stokes")
+set(projects2d "heat" "pfc" "stokes" "navier_stokes")
 
 foreach(project ${projects2d})
     add_executable(${project} ${project}.cc)
     add_dune_alberta_flags(GRIDDIM 2 WORLDDIM 2 ${project})
     target_link_dune_default_libraries(${project})
     target_link_libraries(${project} "duneamdis")
-    target_compile_definitions(${project} PRIVATE DIM=2 DOW=2)
+    target_compile_definitions(${project} PRIVATE AMDIS_DIM=2 AMDIS_DOW=2)
 endforeach()
 
 set(projects3d "ellipt")
@@ -16,5 +16,5 @@ foreach(project ${projects3d})
     add_dune_alberta_flags(GRIDDIM 3 WORLDDIM 3 ${project})
     target_link_dune_default_libraries(${project})
     target_link_libraries(${project} "duneamdis")
-    target_compile_definitions(${project} PRIVATE DIM=3 DOW=3)
+    target_compile_definitions(${project} PRIVATE AMDIS_DIM=3 AMDIS_DOW=3)
 endforeach()
\ No newline at end of file

src/ellipt.cc

@@ -9,8 +9,10 @@
 #include <dune/amdis/ProblemStat.hpp>
 #include <dune/amdis/Literals.hpp>
 
+using namespace AMDiS;
+
 // 1 component with polynomial degree 1
-using ElliptParam   = ProblemStatTraits<DIM, DOW, 1>;
+using ElliptParam   = ProblemStatTraits<AMDIS_DIM, AMDIS_DOW, 1>;
 using ElliptProblem = ProblemStat<ElliptParam>;
 using ElliptProblemInstat = ProblemInstat<ElliptParam>;