r45074 - /packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Wed Jun 20 08:00:40 2012
New Revision: 45074

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45074
Log:
update patch to latest svn rev 12455

Modified:
    packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch

Modified: packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch?rev=45074&op=diff
==============================================================================
--- packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch (original)
+++ packages/gmsh-tetgen/trunk/debian/patches/Alauzet.patch Wed Jun 20 08:00:40 2012
@@ -1,40 +1,3 @@
-Index: gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/BackgroundMesh.cpp
-===================================================================
---- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Mesh/BackgroundMesh.cpp	2012-05-10 21:50:05.000000000 +0200
-+++ gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/BackgroundMesh.cpp	2012-05-10 21:53:21.435618616 +0200
-@@ -397,6 +397,7 @@
-                         double U, double V, 
-                         double X, double Y, double Z)
- {
-+  std::cout << "BGM\n";
-   // default lc (mesh size == size of the model)
-   double l1 = CTX::instance()->lc;
-   const double max_lc =  CTX::instance()->mesh.lcMax;
-@@ -414,11 +415,15 @@
-   // lc from fields
-   SMetric3 l4(1./(max_lc*max_lc));
-   FieldManager *fields = ge->model()->getFields();
-+  //std::cout << "backgroundfield=" << fields->getBackgroundField() << "\n";
-   if(fields->getBackgroundField() > 0){
-     Field *f = fields->get(fields->getBackgroundField());
-+    //std::cout << "isotropic=" << f->isotropic() << "\n";
-     if(f){
-+      //std::cout << "isotropic=" << f->isotropic() << "\n";
-       if (!f->isotropic()){
-         (*f)(X, Y, Z, l4,ge);
-+	//printf("l=[%g %g %g %g %g %g]\n",l4(0,0),l4(1,1),l4(2,2),l4(0,1),l4(0,2),l4(1,2));
-         /*
-         if (ge->tag() == 3){
-           printf("X = %12.5E , l4 = %12.5E %12.5E %12.5E l2 = %12.5E\n",X,l4(0,0),l4(1,1),l4(0,1),l2);
-@@ -445,7 +450,7 @@
-   
-   SMetric3 LC(1./(lc*lc));
-   SMetric3 m = intersection_conserveM1(intersection_conserveM1 (l4, LC),l3);
--  //printf("%g %g %g %g %g %g\n",m(0,0),m(1,1),m(2,2),m(0,1),m(0,2),m(1,2));
-+  //printf("m=[%g %g %g %g %g %g]\n",m(0,0),m(1,1),m(2,2),m(0,1),m(0,2),m(1,2));
-   {
-     fullMatrix<double> V(3,3);
-     fullVector<double> S(3);
 Index: gmsh-tetgen-2.5.1~beta2~svn12051/Mesh/Field.cpp
 ===================================================================
 --- gmsh-tetgen-2.5.1~beta2~svn12051.orig/Mesh/Field.cpp	2012-05-10 21:50:05.000000000 +0200