src/NETGEN/netgen45ForSalome.patch

   1 diff -N -r -u netgen45_orig/libsrc/interface/Makefile netgen45_new/libsrc/interface/Makefile
   2 --- netgen45_orig/libsrc/interface/Makefile     2006-04-13 12:58:37.000000000 +0400
   3 +++ netgen45_new/libsrc/interface/Makefile      2006-04-25 11:55:09.296578936 +0400
   4 @@ -1,4 +1,5 @@
   5 -src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp  writegmsh.cpp writejcm.cpp readuser.cpp importsolution.cpp
   6 +#src = nginterface.cpp writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp  writegmsh.cpp writejcm.cpp readuser.cpp importsolution.cpp
   7 +src = writeuser.cpp writediffpack.cpp writeabaqus.cpp writefluent.cpp writepermas.cpp writetochnog.cpp writetecplot.cpp wuchemnitz.cpp writetochnog.cpp writefeap.cpp writeelmer.cpp  writegmsh.cpp writejcm.cpp readuser.cpp nglib.cpp ngnewdelete.cpp
   8  #
   9  lib = nginterface
  10  libpath = libsrc/interface
  11 diff -N -r -u netgen45_orig/libsrc/interface/nglib.cpp netgen45_new/libsrc/interface/nglib.cpp
  12 --- netgen45_orig/libsrc/interface/nglib.cpp    2006-04-13 12:58:37.000000000 +0400
  13 +++ netgen45_new/libsrc/interface/nglib.cpp     2006-04-25 11:55:09.297578764 +0400
  14 @@ -56,7 +56,8 @@
  15
  16  void Ng_Exit ()
  17  {
  18 -  ;
  19 +  delete testout;
  20 +  testout = NULL;
  21  }
  22
  23
  24 diff -N -r -u netgen45_orig/libsrc/makefile.inc netgen45_new/libsrc/makefile.inc
  25 --- netgen45_orig/libsrc/makefile.inc   2006-04-13 12:58:37.000000000 +0400
  26 +++ netgen45_new/libsrc/makefile.inc    2006-04-25 11:55:09.297578764 +0400
  27 @@ -8,17 +8,14 @@
  28  LIBSRC_DIR=$(CPP_DIR)/libsrc
  29  LIB_DIR=$(CPP_DIR)/lib/$(MACHINE)
  30
  31 -#OCC_DIR=../../occ
  32 -#OCCINC_DIR=$(OCC_DIR)/inc
  33 -#OCCLIB_DIR=$(OCC_DIR)/lib
  34 -# OCC_DIR=/opt/OpenCASCADE5.2/ros
  35 -# OCC_DIR=/home/joachim/download/occ/Linux
  36 -# OCCINC_DIR=$(OCC_DIR)/inc  -I$(OCC_DIR)/ros/inc
  37 -# OCCLIB_DIR=$(OCC_DIR)/Linux/lib
  38 +OCC_DIR=$(CASROOT)
  39 +OCCINC_DIR=$(OCC_DIR)/inc
  40 +OCCLIB_DIR=$(OCC_DIR)/Linux/lib
  41  #
  42  include $(LIBSRC_DIR)/makefile.mach.$(MACHINE)
  43  #
  44 -CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR)
  45 +CPLUSPLUSFLAGS1 = -c -I$(LIBSRC_DIR)/include -I$(OCCINC_DIR) \
  46 +       -DOCCGEOMETRY -DOCC52 -DHAVE_IOSTREAM -DHAVE_LIMITS
  47  #
  48  ARFLAGS = r
  49  #
  50 diff -N -r -u netgen45_orig/libsrc/makefile.mach.LINUX netgen45_new/libsrc/makefile.mach.LINUX
  51 --- netgen45_orig/libsrc/makefile.mach.LINUX    2006-04-13 12:58:37.000000000 +0400
  52 +++ netgen45_new/libsrc/makefile.mach.LINUX     2006-04-25 11:55:09.298578593 +0400
  53 @@ -16,7 +16,7 @@
  54  #
  55  CFLAGS2 =
  56
  57 -CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX -DOPENGL \
  58 +CPLUSPLUSFLAGS2 = -O2 -I/usr/include/GL3.5 -DLINUX \
  59         -ftemplate-depth-99 -finline-limit=10000 \
  60         -Wdisabled-optimization  -funroll-loops  -DnoNGSOLVE
  61
  62 diff -N -r -u netgen45_orig/libsrc/meshing/improve2.cpp netgen45_new/libsrc/meshing/improve2.cpp
  63 --- netgen45_orig/libsrc/meshing/improve2.cpp   2006-03-29 15:09:49.000000000 +0400
  64 +++ netgen45_new/libsrc/meshing/improve2.cpp    2006-04-25 11:56:02.693420537 +0400
  65 @@ -4,7 +4,7 @@
  66  #include <opti.hpp>
  67
  68  #ifndef SMALLLIB
  69 -#include <visual.hpp>
  70 +//#include <visual.hpp>
  71  #endif
  72
  73  namespace netgen
  74 diff -N -r -u netgen45_orig/libsrc/occ/occconstruction.cpp netgen45_new/libsrc/occ/occconstruction.cpp
  75 --- netgen45_orig/libsrc/occ/occconstruction.cpp        2006-04-13 12:58:37.000000000 +0400
  76 +++ netgen45_new/libsrc/occ/occconstruction.cpp 2006-04-25 11:55:09.298578593 +0400
  77 @@ -28,8 +28,8 @@
  78  #include <BRepAlgoAPI_Common.hxx>
  79  #include <BRepAlgoAPI_Fuse.hxx>
  80  #include <BRepAlgoAPI_Section.hxx>
  81 -#include <BRepOffsetAPI_Sewing.hxx>
  82 -#include <BRepAlgo_Sewing.hxx>
  83 +//#include <BRepOffsetAPI_Sewing.hxx>
  84 +//#include <BRepAlgo_Sewing.hxx>
  85  #include <BRepOffsetAPI_MakeOffsetShape.hxx>
  86  #include <ShapeFix_Shape.hxx>
  87  namespace netgen
  88 diff -N -r -u netgen45_orig/libsrc/occ/occgenmesh.cpp netgen45_new/libsrc/occ/occgenmesh.cpp
  89 --- netgen45_orig/libsrc/occ/occgenmesh.cpp     2006-04-13 12:58:37.000000000 +0400
  90 +++ netgen45_new/libsrc/occ/occgenmesh.cpp      2006-04-25 11:55:09.300578250 +0400
  91 @@ -112,7 +112,7 @@
  92
  93    static void FindEdges (OCCGeometry & geom, Mesh & mesh)
  94    {
  95 -    char * savetask = multithread.task;
  96 +    const char * savetask = multithread.task;
  97      multithread.task = "Edge meshing";
  98
  99      (*testout) << "edge meshing" << endl;
 100 @@ -394,7 +394,7 @@
 101      int i, j, k;
 102      int changed;
 103
 104 -    char * savetask = multithread.task;
 105 +    const char * savetask = multithread.task;
 106      multithread.task = "Surface meshing";
 107
 108      geom.facemeshstatus = 0;
 109 @@ -779,7 +779,7 @@
 110        double nq = n*q;
 111
 112        Point<3> p = p0 + 0.5*n;
 113 -      double lambda = (p-l.p0)*n / nq;
 114 +      double lambda = (fabs(nq) > 1e-10 ? (p-l.p0)*n / nq : -1);
 115
 116        if (lambda >= 0 && lambda <= 1)
 117         {
 118 @@ -970,7 +970,7 @@
 119         if (mparam.uselocalh)
 120           {
 121
 122 -           char * savetask = multithread.task;
 123 +           const char * savetask = multithread.task;
 124             multithread.percent = 0;
 125
 126             mesh->SetLocalH (bb.PMin(), bb.PMax(), mparam.grading);
 127 diff -N -r -u netgen45_orig/libsrc/occ/occgeom.cpp netgen45_new/libsrc/occ/occgeom.cpp
 128 --- netgen45_orig/libsrc/occ/occgeom.cpp        2006-04-13 12:58:37.000000000 +0400
 129 +++ netgen45_new/libsrc/occ/occgeom.cpp 2006-04-25 11:55:09.301578078 +0400
 130 @@ -947,13 +947,13 @@
 131
 132    void OCCGeometry :: BuildVisualizationMesh ()
 133    {
 134 -
 135 -    cout << "Preparing visualization (deflection = " << vispar.occdeflection << ") ... " << flush;
 136 +    double vispar_occdeflection = 0.01;
 137 +    cout << "Preparing visualization (deflection = " << vispar_occdeflection << ") ... " << flush;
 138
 139
 140      BRepTools::Clean (shape);
 141      //WriteOCC_STL("test.stl");
 142 -    BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, vispar.occdeflection, true);
 143 +    BRepMesh_IncrementalMesh::BRepMesh_IncrementalMesh (shape, vispar_occdeflection, true);
 144      cout << "done" << endl;
 145
 146
 147 diff -N -r -u netgen45_orig/libsrc/occ/occgeom.hpp netgen45_new/libsrc/occ/occgeom.hpp
 148 --- netgen45_orig/libsrc/occ/occgeom.hpp        2006-04-13 12:58:37.000000000 +0400
 149 +++ netgen45_new/libsrc/occ/occgeom.hpp 2006-04-25 11:55:09.302577907 +0400
 150 @@ -69,7 +69,7 @@
 151  #include "IGESToBRep_Reader.hxx"
 152  #include "Interface_Static.hxx"
 153  #include "GeomAPI_ExtremaCurveCurve.hxx"
 154 -#include "Standard_ErrorHandler.hxx"
 155 +//#include "Standard_ErrorHandler.hxx"
 156  #include "Standard_Failure.hxx"
 157  #include "ShapeUpgrade_ShellSewing.hxx"
 158  #include "ShapeFix_Shape.hxx"
 159 @@ -88,7 +88,7 @@
 160  namespace netgen
 161  {
 162
 163 -#include "../visualization/vispar.hpp"
 164 +  //#include "../visualization/vispar.hpp"
 165    //  class VisualizationParameters;
 166    //  extern VisualizationParameters vispar;
 167
 168 diff -N -r -u netgen45_orig/makeForSalome.sh netgen45_new/makeForSalome.sh
 169 --- netgen45_orig/makeForSalome.sh      1970-01-01 03:00:00.000000000 +0300
 170 +++ netgen45_new/makeForSalome.sh       2006-04-25 11:55:09.302577907 +0400
 171 @@ -0,0 +1,31 @@
 172 +#! /bin/sh
 173 +cp ngtcltk/ngnewdelete.* libsrc/interface/
 174 +
 175 +MACHINE=LINUX
 176 +export MACHINE
 177 +make -C libsrc/csg
 178 +make -C libsrc/general
 179 +make -C libsrc/geom2d
 180 +make -C libsrc/gprim
 181 +make -C libsrc/interface
 182 +make -C libsrc/linalg
 183 +make -C libsrc/meshing
 184 +make -C libsrc/opti
 185 +make -C libsrc/stlgeom
 186 +make -C libsrc/occ
 187 +
 188 +if [ ! -d install ] ; then
 189 +       mkdir install
 190 +fi
 191 +
 192 +cp -r lib install/
 193 +
 194 +if [ ! -d install/include ] ; then
 195 +       mkdir install/include
 196 +fi
 197 +
 198 +cp libsrc/interface/nglib.h libsrc/general/*.hpp libsrc/csg/*.hpp libsrc/geom2d/*.hpp \
 199 +    libsrc/gprim/*.hpp libsrc/linalg/*.hpp libsrc/meshing/*.hpp \
 200 +    libsrc/occ/*.hpp libsrc/opti/*.hpp libsrc/include/mydefs.hpp \
 201 +    libsrc/stlgeom/*.hpp libsrc/include/mystdlib.h \
 202 +    install/include