From 0af92bbd8a2f56151853ba06616a8c90e12cea66 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Aug 08 2015 08:34:29 +0000 Subject: Update gmsh_sign.patch --- diff --git a/gmsh_sign.patch b/gmsh_sign.patch index 07919fb..5c48090 100644 --- a/gmsh_sign.patch +++ b/gmsh_sign.patch @@ -1,6 +1,6 @@ diff -rupN gmsh-2.10.1-source/Geo/GEdge.cpp gmsh-2.10.1-source-new/Geo/GEdge.cpp --- gmsh-2.10.1-source/Geo/GEdge.cpp 2015-06-26 10:58:42.000000000 +0200 -+++ gmsh-2.10.1-source-new/Geo/GEdge.cpp 2015-08-08 01:48:29.069627945 +0200 ++++ gmsh-2.10.1-source-new/Geo/GEdge.cpp 2015-08-08 09:23:32.123629026 +0200 @@ -259,7 +259,7 @@ std::string GEdge::getAdditionalInfoStri sstream << " transfinite (" << meshAttributes.nbPointsTransfinite; int type = meshAttributes.typeTransfinite; @@ -12,7 +12,7 @@ diff -rupN gmsh-2.10.1-source/Geo/GEdge.cpp gmsh-2.10.1-source-new/Geo/GEdge.cpp sstream << ")"; diff -rupN gmsh-2.10.1-source/Geo/Geo.cpp gmsh-2.10.1-source-new/Geo/Geo.cpp --- gmsh-2.10.1-source/Geo/Geo.cpp 2015-05-15 15:39:10.000000000 +0200 -+++ gmsh-2.10.1-source-new/Geo/Geo.cpp 2015-08-08 01:48:29.071627981 +0200 ++++ gmsh-2.10.1-source-new/Geo/Geo.cpp 2015-08-08 09:23:32.125629068 +0200 @@ -4566,7 +4566,7 @@ void setSurfaceGeneratrices(Surface *s, (i != 0 && iLoop < 0)){ // hole for(int j = 0; j < List_Nbr(el->Curves); j++) { @@ -42,7 +42,7 @@ diff -rupN gmsh-2.10.1-source/Geo/Geo.cpp gmsh-2.10.1-source-new/Geo/Geo.cpp } diff -rupN gmsh-2.10.1-source/Geo/GModelIO_GEO.cpp gmsh-2.10.1-source-new/Geo/GModelIO_GEO.cpp --- gmsh-2.10.1-source/Geo/GModelIO_GEO.cpp 2015-07-21 07:56:24.000000000 +0200 -+++ gmsh-2.10.1-source-new/Geo/GModelIO_GEO.cpp 2015-08-08 01:48:29.072627999 +0200 ++++ gmsh-2.10.1-source-new/Geo/GModelIO_GEO.cpp 2015-08-08 09:23:32.126629089 +0200 @@ -325,7 +325,7 @@ int GModel::importGEOInternals() case MSH_PHYSICAL_SURFACE: ge = getFaceByTag(tag); break; case MSH_PHYSICAL_VOLUME: ge = getRegionByTag(tag); break; @@ -54,7 +54,7 @@ diff -rupN gmsh-2.10.1-source/Geo/GModelIO_GEO.cpp gmsh-2.10.1-source-new/Geo/GM ge->physicals.push_back(pnum); diff -rupN gmsh-2.10.1-source/Geo/gmshEdge.cpp gmsh-2.10.1-source-new/Geo/gmshEdge.cpp --- gmsh-2.10.1-source/Geo/gmshEdge.cpp 2015-07-27 20:48:27.000000000 +0200 -+++ gmsh-2.10.1-source-new/Geo/gmshEdge.cpp 2015-08-08 01:48:29.073628018 +0200 ++++ gmsh-2.10.1-source-new/Geo/gmshEdge.cpp 2015-08-08 09:23:32.126629089 +0200 @@ -99,7 +99,7 @@ std::string gmshEdge::getAdditionalInfoS sstream << " transfinite (" << meshAttributes.nbPointsTransfinite; int type = meshAttributes.typeTransfinite; @@ -66,7 +66,7 @@ diff -rupN gmsh-2.10.1-source/Geo/gmshEdge.cpp gmsh-2.10.1-source-new/Geo/gmshEd sstream << ")"; diff -rupN gmsh-2.10.1-source/Geo/gmshRegion.cpp gmsh-2.10.1-source-new/Geo/gmshRegion.cpp --- gmsh-2.10.1-source/Geo/gmshRegion.cpp 2015-03-08 14:03:26.000000000 +0100 -+++ gmsh-2.10.1-source-new/Geo/gmshRegion.cpp 2015-08-08 01:48:29.073628018 +0200 ++++ gmsh-2.10.1-source-new/Geo/gmshRegion.cpp 2015-08-08 09:23:32.127629110 +0200 @@ -32,7 +32,7 @@ gmshRegion::gmshRegion(GModel *m, ::Volu GFace *f = m->getFaceByTag(abs(is)); if(f){ @@ -78,7 +78,7 @@ diff -rupN gmsh-2.10.1-source/Geo/gmshRegion.cpp gmsh-2.10.1-source-new/Geo/gmsh else diff -rupN gmsh-2.10.1-source/Mesh/meshGEdge.cpp gmsh-2.10.1-source-new/Mesh/meshGEdge.cpp --- gmsh-2.10.1-source/Mesh/meshGEdge.cpp 2015-07-27 20:48:26.000000000 +0200 -+++ gmsh-2.10.1-source-new/Mesh/meshGEdge.cpp 2015-08-08 01:48:29.074628036 +0200 ++++ gmsh-2.10.1-source-new/Mesh/meshGEdge.cpp 2015-08-08 09:23:32.127629110 +0200 @@ -168,7 +168,7 @@ static double F_Transfinite(GEdge *ge, d case 1: // Geometric progression ar^i; Sum of n terms = length = a (r^n-1)/(r-1) @@ -90,7 +90,7 @@ diff -rupN gmsh-2.10.1-source/Mesh/meshGEdge.cpp gmsh-2.10.1-source-new/Mesh/mes val = d / (a * pow(r, (double)i)); diff -rupN gmsh-2.10.1-source/Numeric/Numeric.h gmsh-2.10.1-source-new/Numeric/Numeric.h --- gmsh-2.10.1-source/Numeric/Numeric.h 2015-03-08 14:03:21.000000000 +0100 -+++ gmsh-2.10.1-source-new/Numeric/Numeric.h 2015-08-08 01:48:29.074628036 +0200 ++++ gmsh-2.10.1-source-new/Numeric/Numeric.h 2015-08-08 09:23:32.128629131 +0200 @@ -14,7 +14,7 @@ #include "SVector3.h" @@ -100,9 +100,30 @@ diff -rupN gmsh-2.10.1-source/Numeric/Numeric.h gmsh-2.10.1-source-new/Numeric/N #define SQU(a) ((a)*(a)) struct mean_plane +diff -rupN gmsh-2.10.1-source/Parser/Gmsh.tab.cpp gmsh-2.10.1-source-new/Parser/Gmsh.tab.cpp +--- gmsh-2.10.1-source/Parser/Gmsh.tab.cpp 2015-07-27 20:48:27.000000000 +0200 ++++ gmsh-2.10.1-source-new/Parser/Gmsh.tab.cpp 2015-08-08 09:24:53.349538297 +0200 +@@ -8727,7 +8727,7 @@ yyreduce: + if(c){ + c->Method = MESH_TRANSFINITE; + c->nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2; +- c->typeTransfinite = type * sign(d); ++ c->typeTransfinite = type * SIGN(d); + c->coeffTransfinite = coef; + } + else{ +@@ -8735,7 +8735,7 @@ yyreduce: + if(ge){ + ge->meshAttributes.method = MESH_TRANSFINITE; + ge->meshAttributes.nbPointsTransfinite = ((yyvsp[-2].d) > 2) ? (int)(yyvsp[-2].d) : 2; +- ge->meshAttributes.typeTransfinite = type * sign(d); ++ ge->meshAttributes.typeTransfinite = type * SIGN(d); + ge->meshAttributes.coeffTransfinite = coef; + } + else if(sign > 0) diff -rupN gmsh-2.10.1-source/Parser/Gmsh.y gmsh-2.10.1-source-new/Parser/Gmsh.y --- gmsh-2.10.1-source/Parser/Gmsh.y 2015-07-27 20:48:27.000000000 +0200 -+++ gmsh-2.10.1-source-new/Parser/Gmsh.y 2015-08-08 01:48:29.084628217 +0200 ++++ gmsh-2.10.1-source-new/Parser/Gmsh.y 2015-08-08 09:23:32.129629152 +0200 @@ -3735,7 +3735,7 @@ Constraints : if(c){ c->Method = MESH_TRANSFINITE; @@ -123,7 +144,7 @@ diff -rupN gmsh-2.10.1-source/Parser/Gmsh.y gmsh-2.10.1-source-new/Parser/Gmsh.y else if(sign > 0) diff -rupN gmsh-2.10.1-source/Plugin/FaultZone.cpp gmsh-2.10.1-source-new/Plugin/FaultZone.cpp --- gmsh-2.10.1-source/Plugin/FaultZone.cpp 2015-04-20 16:06:03.000000000 +0200 -+++ gmsh-2.10.1-source-new/Plugin/FaultZone.cpp 2015-08-08 01:48:29.084628217 +0200 ++++ gmsh-2.10.1-source-new/Plugin/FaultZone.cpp 2015-08-08 09:23:32.130629173 +0200 @@ -430,7 +430,7 @@ void GMSH_FaultZoneMesher::ComputeHeavis lsn = dot(vectsNor[j], vectsNor[i])*heav[i]; assert(fabs(lsn) > tolerance || heav[i] == 0);