Merge branch 'master' of https://gitlab.math.tu-dresden.de/iwr/amdis

AMDiS/src/parallel/PetscHelper.cc

@@ -308,7 +308,11 @@ namespace AMDiS
     PetscViewer viewer;
     PetscViewerCreate(PETSC_COMM_WORLD, &viewer);
     PetscViewerSetType(viewer, PETSCVIEWERASCII);
+#if (PETSC_VERSION_MINOR >= 7)
+    PetscOptionsView(PETSC_NULL, viewer);
+#else
     PetscOptionsView(viewer);
+#endif
     PetscViewerDestroy(&viewer);
 #endif
       }

AMDiS/src/parallel/PetscSolverGlobalMatrix.cc

@@ -95,8 +95,13 @@ namespace AMDiS { namespace Parallel {
     PetscViewer viewer;
     PetscViewerCreate(PETSC_COMM_WORLD, &viewer);
     PetscViewerSetType(viewer, PETSCVIEWERASCII);
+#if (PETSC_VERSION_MINOR >= 7)
+    PetscOptionsView(PETSC_NULL, viewer);
+#else
     PetscOptionsView(viewer);
+#endif
     PetscViewerDestroy(&viewer);
+
     }
 #endif
   }

extensions/preconditioner/PetscSolverNavierStokes2.cc

@@ -139,9 +139,9 @@ namespace AMDiS { namespace Parallel {
     KSPSetOperators(ksp, getMatInterior(), getMatInterior(), SAME_NONZERO_PATTERN);
 #endif
     if (getInfo() >= 10)
-      KSPMonitorSet(ksp, KSPMonitorDefault, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorDefault), PETSC_NULL, PETSC_NULL);
     else if (getInfo() >= 20)
-      KSPMonitorSet(ksp, KSPMonitorTrueResidualNorm, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorTrueResidualNorm), PETSC_NULL, PETSC_NULL);
     petsc_helper::setSolver(ksp, "ns_", KSPFGMRES, PCNONE, getRelative(), getTolerance(), getMaxIterations());
 
     // Create null space information.

extensions/preconditioner/PetscSolverPfc.cc

@@ -84,9 +84,9 @@ namespace AMDiS { namespace Parallel {
     KSPSetOperators(ksp, getMatInterior(), getMatInterior(), SAME_NONZERO_PATTERN);
 #endif
     if (getInfo() >= 10)
-      KSPMonitorSet(ksp, KSPMonitorDefault, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorDefault), PETSC_NULL, PETSC_NULL);
     else if (getInfo() >= 20)
-      KSPMonitorSet(ksp, KSPMonitorTrueResidualNorm, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CASTKSPMonitorTrueResidualNorm), PETSC_NULL, PETSC_NULL);
     petsc_helper::setSolver(ksp, "pfc_", KSPFGMRES, PCNONE, getRelative(), getTolerance(), getMaxIterations());
     KSPSetFromOptions(ksp);
 

extensions/preconditioner/PetscSolverPfc_diag.cc

@@ -82,9 +82,9 @@ namespace AMDiS { namespace Parallel {
     KSPSetOperators(ksp, getMatInterior(), getMatInterior(), SAME_NONZERO_PATTERN);
 #endif
     if (getInfo() >= 10)
-      KSPMonitorSet(ksp, KSPMonitorDefault, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorDefault), PETSC_NULL, PETSC_NULL);
     else if (getInfo() >= 20)
-      KSPMonitorSet(ksp, KSPMonitorTrueResidualNorm, PETSC_NULL, PETSC_NULL);
+      KSPMonitorSet(ksp, PETSC_MONITOR_CAST(KSPMonitorTrueResidualNorm), PETSC_NULL, PETSC_NULL);
     petsc_helper::setSolver(ksp, "pfc_", KSPFGMRES, PCNONE, getRelative(), getTolerance(), getMaxIterations());
     KSPSetFromOptions(ksp);