Changed name of vtkValidPoint to HomogeneousDirichlet, as the name is more appropriate.

examples/ResampleWithDataset.cpp

@@ -79,6 +79,7 @@ int main(int argc, char**argv) {
         Resample->SetInputData( uGrid );
         Resample->SetSourceData( Stencil->GetOutput() );
         Resample->SpatialMatchOn();
+        Resample->SetValidPointMaskArrayName("HomogeneousDirichlet");
         Resample->Update();
 
     std::cout << *Resample << std::endl;

examples/borehole/sphere.sh

@@ -1,41 +1,8 @@
 #!/usr/bin/env bash
 gmsh  -3 -format vtk -o sphere.vtk  sphere.geo 
 gmsh  -2 -format stl -o sphereBox.stl  sphereBox.geo 
-//paraview --state=boundarySphere.pvsm 
 ../ResampleWithDataset  sphere.vtk  sphereBox.stl  MergedSphere.vtu 
-
-
 ../VTKEdgeGsphere MergedSphere.vtu   2.25  gravity  sphereGrav.vtu
 ../FEM4EllipticPDE_bhmag  sphereGrav.vtu  sphereGrav.vtu   sphereOutGrav.vtu 
 
-paraview --state=sliceGravSphere3.pvsm
-
-#IMPORTANT! 
-#   Select ResampleWithDataset1
-#	-->File -> SaveData -> MergedSphere.vtu 
-
-# Set up problem 
-
-
-# Gravity problem
-#../VTKEdgeGsphere MergedSphere.vtu   2.25  gravity  sphereGrav.vtu
-#../FEM4EllipticPDE_bhmag  sphereGrav.vtu  sphereGrav.vtu   sphereOutGrav.vtu 
-
-#paraview --state=sliceSphere.pvsm
-
-
-# --data=sphereOut.vtu
-
-# even finer meshing
-# radius = 4, u = \pm .9              analytic = \pm 1.33
-
-# Finer meshing
-# radius = 5, u = \pm 1.65            analytic = \pm 1.67
-# radius = 4, u = \pm 1.09            analytic = \pm 1.33
-
-# radius = 5, u = \pm 2.5             analytic = \pm 1.67
-# radius = 4, u = \pm 1.66            analytic = \pm 1.33
-# radius = 3, u= \pm .926 -.985       analytic = \pm 1
-# radius = 2, u = \pm.42              analytic = \pm .667
-# for radius=1,  u = \pm .111         analytic = \pm .333 
-# for radius=.5, u = \pm .0477 -.0462 analytic = \pm .167
+#paraview --data=sphereOutGrav.vtu 

src/FEM4EllipticPDE.cpp

@@ -199,7 +199,7 @@ namespace Lemma {
 
 
 
-    void FEM4EllipticPDE::Solve( const std::string& resfile) {
+    void FEM4EllipticPDE::Solve( const std::string& resfile ) {
         ConstructAMatrix();
         //ConstructLoadVector();
 
@@ -213,10 +213,10 @@ namespace Lemma {
         Eigen::ConjugateGradient< Eigen::SparseMatrix<Real>  > cg(A);
 
         //Eigen::BiCGSTAB<Eigen::SparseMatrix<Real> > cg(A);
-        cg.setMaxIterations(3000);
-        cg.setTolerance(1e-28);
+        //cg.setMaxIterations(3000);
+        //cg.setTolerance(1e-28);
 
-        std::cout << "  rows\tcols\n";
+        std::cout << "   rows\tcols\n";
         std::cout << "A: "  << A.rows() << "\t" << A.cols() << std::endl;
         std::cout << "g: "  << g.rows() << "\t" << g.cols() << std::endl;
 
@@ -265,8 +265,8 @@ namespace Lemma {
         A.resize(vtkGrid->GetNumberOfPoints(), vtkGrid->GetNumberOfPoints());
         std::vector< Eigen::Triplet<Real> > coeffs;
 
-        if ( !vtkGrid->GetPointData()->GetScalars("vtkValidPointMask") ) {
-            throw std::runtime_error("No vtkValidPointMask");
+        if ( !vtkGrid->GetPointData()->GetScalars("HomogeneousDirichlet") ) {
+            throw std::runtime_error("No HomogeneousDirichlet boundary conditions in input file.");
         }
 
         if ( !vtkGrid->GetCellData()->GetScalars("G") && !vtkGrid->GetPointData()->GetScalars("G") ) {
@@ -325,7 +325,7 @@ namespace Lemma {
                     /* homogeneous Dirichlet boundary */
                     if (jj == ii) {
                         // Apply Homogeneous Dirichlet Boundary conditions
-                        Real bb = vtkGrid->GetPointData()->GetScalars("vtkValidPointMask")->GetTuple(ID[ii])[0];
+                        Real bb = vtkGrid->GetPointData()->GetScalars("HomogeneousDirichlet")->GetTuple(ID[ii])[0];
                         Real bdry = (1./(BndryH*BndryH))*BndrySigma*bb; // + sum;
                         //Real bdry = GradPhi.col(ii).tail<3>().dot(GradPhi.col(ii).tail<3>())*BndrySigma*bb; // + sum;
                         coeffs.push_back( Eigen::Triplet<Real> ( ID[ii], ID[jj], bdry + GradPhi.col(ii).tail<3>().dot(GradPhi.col(jj).tail<3>() ) * V * sigma_bar ) );