[gmsh] 04/06: Remove alauzet patch, accepted by upstream.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jul 25 21:21:01 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository gmsh.
commit 4766758e44e63a2322088bda3f7c102be569b0db
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jul 25 22:06:36 2014 +0200
Remove alauzet patch, accepted by upstream.
---
debian/patches/alauzet.patch | 192 -------------------------------------------
debian/patches/series | 1 -
2 files changed, 193 deletions(-)
diff --git a/debian/patches/alauzet.patch b/debian/patches/alauzet.patch
deleted file mode 100644
index 6dc5c76..0000000
--- a/debian/patches/alauzet.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Index: gmsh-2.8.5-source/Mesh/Field.cpp
-===================================================================
---- gmsh-2.8.5-source.orig/Mesh/Field.cpp
-+++ gmsh-2.8.5-source/Mesh/Field.cpp
-@@ -534,6 +534,55 @@ class SphereField : public Field
- }
- };
-
-+class SphereField : public Field
-+{
-+ double v_in, v_out;
-+ double xc,yc,zc;
-+ double R;
-+
-+ public:
-+ std::string getDescription()
-+ {
-+ return "The value of this field is VIn inside a sphere, VOut outside. "
-+ "The sphere is given by\n\n"
-+ " ||dX||^2 < R^2 &&\n"
-+ " dX = (X - XC)^2 + (Y-YC)^2 + (Z-ZC)^2";
-+ }
-+ SphereField()
-+ {
-+ v_in = v_out = xc = yc = zc = R = 0;
-+
-+ options["VIn"] = new FieldOptionDouble
-+ (v_in, "Value inside the sphere");
-+ options["VOut"] = new FieldOptionDouble
-+ (v_out, "Value outside the sphere");
-+
-+ options["XCenter"] = new FieldOptionDouble
-+ (xc, "X coordinate of the sphere center");
-+ options["YCenter"] = new FieldOptionDouble
-+ (yc, "Y coordinate of the sphere center");
-+ options["ZCenter"] = new FieldOptionDouble
-+ (zc, "Z coordinate of the sphere center");
-+
-+
-+ options["Radius"] = new FieldOptionDouble
-+ (R,"Radius");
-+
-+ }
-+ const char *getName()
-+ {
-+ return "Sphere";
-+ }
-+ double operator() (double x, double y, double z, GEntity *ge=0)
-+ {
-+ double dx = x-xc;
-+ double dy = y-yc;
-+ double dz = z-zc;
-+
-+ return ( (dx*dx + dy*dy + dz*dz < R*R) ) ? v_in : v_out;
-+ }
-+};
-+
- class FrustumField : public Field
- {
- double x1,y1,z1;
-@@ -1340,17 +1389,21 @@ class MinAnisoField : public Field
- }
- virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
- {
-+ //std::cout << "MinAnisoField idlist=" << idlist.size() << "\n";
- SMetric3 v (1./MAX_LC);
- for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
- Field *f = (GModel::current()->getFields()->get(*it));
-+ //std::cout << "Field[" << *it << "]\n";
- SMetric3 ff;
- if(f && *it != id) {
- if (f->isotropic()){
- double l = (*f) (x, y, z, ge);
- ff = SMetric3(1./(l*l));
-+ //printf("ff=[%g %g %g %g %g %g]\n",ff(0,0),ff(1,1),ff(2,2),ff(0,1),ff(0,2),ff(1,2));
- }
- else{
- (*f) (x, y, z, ff, ge);
-+ //printf("ff_iso=[%g %g %g %g %g %g]\n",ff(0,0),ff(1,1),ff(2,2),ff(0,1),ff(0,2),ff(1,2));
- }
- v = intersection_conserve_mostaniso(v,ff);
- }
-@@ -1449,6 +1502,77 @@ class IntersectAnisoField : public Field
- }
- fullMatrix<double> V(3,3);
- fullVector<double> S(3);
-+ metr.eig(V, S, 1);
-+ return sqrt(1./S(2)); //S(2) is largest eigenvalue
-+ }
-+ const char *getName()
-+ {
-+ return "IntersectAniso";
-+ }
-+};
-+
-+class IntersectAnisoField : public Field
-+{
-+ std::list<int> idlist;
-+ public:
-+ IntersectAnisoField()
-+ {
-+ options["FieldsList"] = new FieldOptionList
-+ (idlist, "Field indices", &update_needed);
-+ }
-+ virtual bool isotropic () const {return false;}
-+ std::string getDescription()
-+ {
-+ return "Take the intersection of 2 anisotropic fields according to Alauzet.";
-+ }
-+ virtual void operator() (double x, double y, double z, SMetric3 &metr, GEntity *ge=0)
-+ {
-+ // check if idlist contains 2 elements other error message
-+ SMetric3 v;
-+ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
-+ Field *f = (GModel::current()->getFields()->get(*it));
-+ SMetric3 ff;
-+ if(f && *it != id) {
-+ if (f->isotropic()){
-+ double l = (*f) (x, y, z, ge);
-+ ff = SMetric3(1./(l*l));
-+ }
-+ else{
-+ (*f) (x, y, z, ff, ge);
-+ }
-+ if (it == idlist.begin())
-+ v = ff;
-+ else
-+ v = intersection_alauzet(v,ff);
-+ }
-+ }
-+ metr = v;
-+ }
-+ double operator() (double x, double y, double z, GEntity *ge=0)
-+ {
-+ // check if idlist contains 2 elements other error message
-+ SMetric3 metr;
-+ double v = MAX_LC;
-+ for(std::list<int>::iterator it = idlist.begin(); it != idlist.end(); it++) {
-+ Field *f = (GModel::current()->getFields()->get(*it));
-+ SMetric3 m;
-+ if(f && *it != id){
-+ if (!f->isotropic()){
-+ (*f)(x, y, z, m, ge);
-+ }
-+ else {
-+ double L = (*f)(x, y, z, ge);
-+ for (int i = 0; i < 3; i++)
-+ m(i,i) = 1. / (L*L);
-+ }
-+ }
-+ if (it == idlist.begin())
-+ metr = m;
-+ else
-+ metr = intersection_alauzet(metr,m);
-+ }
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
- metr.eig(V, S, 1);
- return sqrt(1./S(2)); //S(2) is largest eigenvalue
- }
-Index: gmsh-2.8.5-source/Geo/STensor3.cpp
-===================================================================
---- gmsh-2.8.5-source.orig/Geo/STensor3.cpp
-+++ gmsh-2.8.5-source/Geo/STensor3.cpp
-@@ -69,6 +69,27 @@ SMetric3 intersection_alauzet (const SMe
- return iv;
- }
-
-+SMetric3 intersection_alauzet (const SMetric3 &m1, const SMetric3 &m2)
-+{
-+ SMetric3 im1 = m1.invert();
-+ fullMatrix<double> V(3,3);
-+ fullVector<double> S(3);
-+ im1 *= m2;
-+ im1.eig(V,S,true);
-+ SVector3 v0(V(0,0),V(1,0),V(2,0));
-+ SVector3 v1(V(0,1),V(1,1),V(2,1));
-+ SVector3 v2(V(0,2),V(1,2),V(2,2));
-+ // is this required??
-+ v0.normalize();
-+ v1.normalize();
-+ v2.normalize();
-+ double l0 = std::max(dot(v0,m1,v0),dot(v0,m2,v0));
-+ double l1 = std::max(dot(v1,m1,v1),dot(v1,m2,v1));
-+ double l2 = std::max(dot(v2,m1,v2),dot(v2,m2,v2));
-+ SMetric3 iv(l0,l1,l2,v0,v1,v2);
-+ return iv;
-+}
-+
- // preserve orientation of m1 !!!
- SMetric3 intersection_conserveM1 (const SMetric3 &m1, const SMetric3 &m2)
- {
diff --git a/debian/patches/series b/debian/patches/series
index 723232d..a251b18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@ skip_license_file.patch
delete_gl2ps_from_source.patch
switch_from_opencascade_to_oce.patch
fix_FTBFS_linking.patch
-alauzet.patch
fix_gmshpy_import.patch
fix_libdir.patch
fix_script_header.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gmsh.git
More information about the debian-science-commits
mailing list