Commits

Garth Wells committed f68f0fb Merge

Merge branch 'garth/fixes-for-parmetis'

Comments (0)

Files changed (6)

cmake/scripts/download-demo-data

         else
             output=`wget http://fenicsproject.org/pub/data/meshes/$MESH 2>&1`
         fi
-	
+
 	# If download fails
 	if [ $? -ne 0 ]; then
             echo "$output" 1>&2
 }
 
 download_mesh demo/la/eigenvalue                             box_with_dent.xml.gz
-download_mesh demo/undocumented/meshfunction                 unitsquare_2_2.xml.gz
-download_mesh demo/undocumented/meshfunction                 unitsquare_2_2_subdomains.xml.gz
 download_mesh demo/undocumented/mixed-poisson-sphere         sphere_16.xml.gz
 download_mesh demo/undocumented/advection-diffusion          dolfin_fine.xml.gz
 download_mesh demo/undocumented/advection-diffusion          dolfin_fine_velocity.xml.gz

demo/undocumented/meshfunction/cpp/main.cpp

-// Copyright (C) 2006 Ola Skavhaug
-//
-// This file is part of DOLFIN.
-//
-// DOLFIN is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Lesser General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// DOLFIN is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public License
-// along with DOLFIN. If not, see <http://www.gnu.org/licenses/>.
-//
-// Modified by Anders Logg, 2007.
-//
-// First added:  2006-11-29
-// Last changed: 2012-07-05
-
-#include <dolfin.h>
-
-using namespace dolfin;
-
-int main()
-{
-  Mesh mesh("../unitsquare_2_2.xml.gz");
-
-  // Read mesh function from file
-  File in("../unitsquare_2_2_subdomains.xml.gz");
-  MeshFunction<double> f(mesh);
-  in >> f;
-
-  // Write mesh function to XDMF file
-  if (has_hdf5())
-  {
-    File out("meshfunction_out.xdmf");
-    out << f;
-  }
-
-  // Plot mesh function
-  plot(f);
-  interactive();
-
-  return 0;
-}

demo/undocumented/meshfunction/cpp/plot.py

-from dolfin import *
-
-mesh = Mesh("mesh2D.xml.gz")
-mesh_function = MeshFunction("real", mesh, "meshfunction.xml")
-plot(mesh_function)

demo/undocumented/meshfunction/python/demo_meshfunction.py

-"""This demo illustrates use of the MeshFunction class.
-
-Original implementation: ../cpp/main.cpp by Ola Skavhaug."""
-
-# Copyright (C) 2007 Kristian B. Oelgaard
-#
-# This file is part of DOLFIN.
-#
-# DOLFIN is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# DOLFIN is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with DOLFIN. If not, see <http://www.gnu.org/licenses/>.
-#
-# First added:  2007-11-15
-# Last changed: 2008-03-31
-
-from dolfin import *
-
-# Read mesh from file
-mesh = Mesh("../unitsquare_2_2.xml.gz")
-
-# Read mesh function from file
-file_in = File("../unitsquare_2_2_subdomains.xml.gz")
-f = MeshFunction("double", mesh)
-file_in >> f
-
-# Write mesh function to XDMF (requires HDF5)
-if has_hdf5():
-    out = File("meshfunction_out.xdmf");
-    out << f
-
-# Plot mesh function
-plot(f, interactive=True)

demo/undocumented/multidomain/cpp/main.cpp

 
 int main()
 {
+  cout << "This demo is not presently working." << endl;
+  /*
   // Create mesh
   UnitSquareMesh mesh(8, 8);
 
   interactive();
 
   return 0;
+  */
 }

test/unit/mesh/python/Mesh.py

 
     def test_basic_cell_orientations(self):
         "Test that default cell orientations initialize and update as expected."
-        mesh = UnitIntervalMesh(6)
+        mesh = UnitIntervalMesh(12)
         orientations = mesh.cell_orientations()
         self.assertEqual(len(orientations), mesh.num_cells())
         for i in range(mesh.num_cells()):
 
     def test_cell_orientations(self):
         "Test that cell orientations update as expected."
-        mesh = UnitIntervalMesh(6)
+        mesh = UnitIntervalMesh(12)
         mesh.init_cell_orientations(Expression(("0.0", "1.0", "0.0")))
         for i in range(mesh.num_cells()):
             self.assertEqual(mesh.cell_orientations()[i], 0)