--- /dev/null
+<document>
+
+ <config version="5.1.4"
+ caption="SALOME v%1"
+ copyright="<h5>Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE<br><br>Copyright (C) 2003-2007 OPEN CASCADE,<br>EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&D,<br>LEG, PRINCIPIA R&D, BUREAU VERITAS</h5>"
+ license="<h5>GNU LGPL</h5>"
+ platforms="Debian 5.0 64bit"
+ targetdir="${HOME}/salome_5.1.4"
+ tempdir="/tmp"
+ optionallibs="libcppunit,libblsurf"/>
+
+ <buttons>
+ <button label="Launch SALOME"
+ tooltip="Click this button to launch SALOME"
+ script="start_salome.sh"
+ disable="false"/>
+ <button label="Release Notes"
+ tooltip="Click this button to read release notes"
+ script="release_notes.sh"
+ disable="false"/>
+ </buttons>
+ <products>
+ <product name="KERNEL"
+ type="component"
+ description="SALOME platform KERNEL module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="26633,11153,84278"
+ pickupenv="true"
+ script="KERNEL.sh"/>
+ </product>
+ <product name="GUI"
+ type="component"
+ description="SALOME platform GUI module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="21446,10313,79189"
+ script="GUI.sh"/>
+ </product>
+ <product name="GEOM"
+ type="component"
+ description="SALOME platform GEOM module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="44527,17706,191768"
+ script="GEOM.sh"/>
+ </product>
+ <product name="MED"
+ type="component"
+ description="SALOME platform MED module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="113068,71175,376032"
+ script="MED.sh"/>
+ </product>
+ <product name="SMESH"
+ type="component"
+ description="SALOME platform SMESH module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="63544,15848,244628"
+ script="SMESH.sh"/>
+ </product>
+ <product name="VISU"
+ type="component"
+ description="SALOME platform VISU module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="29149,9965,108154"
+ script="VISU.sh"/>
+ </product>
+ <product name="NETGENPLUGIN"
+ type="component"
+ description="SALOME platform NETGEN meshing algorithm plugin">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="10270,349,39271"
+ script="NETGENPLUGIN.sh"/>
+ </product>
+ <product name="GHS3DPLUGIN"
+ type="component"
+ description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="232,120,2583"
+ script="GHS3DPLUGIN.sh"/>
+ </product>
+ <product name="GHS3DPRLPLUGIN"
+ type="component"
+ description="SMESH plugin from CEA">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="232,120,2583"
+ script="GHS3DPRLPLUGIN.sh"/>
+ </product>
+ <product name="HexoticPLUGIN"
+ type="component"
+ description="SMESH plugin from CEA">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="232,120,2583"
+ script="HexoticPLUGIN.sh"/>
+ </product>
+ <product name="BLSURFPLUGIN"
+ type="component"
+ description="SMESH plugin from CEA sources">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="208,221,2958"
+ script="BLSURFPLUGIN.sh"/>
+ </product>
+ <product name="COMPONENT"
+ type="component"
+ description="SALOME platform COMPONENT module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="9904,685,37988"
+ script="COMPONENT.sh"/>
+ </product>
+ <product name="PYCALCULATOR"
+ type="component"
+ description="SALOME platform PYCALCULATOR module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="68,220,2065"
+ script="PYCALCULATOR.sh"/>
+ </product>
+ <product name="CALCULATOR"
+ type="component"
+ description="SALOME platform CALCULATOR module">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="4100,452,17269"
+ script="CALCULATOR.sh"/>
+ </product>
+ <product name="HELLO"
+ type="component"
+ description="Example SALOME C++ module: Hello.">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="2686,196,12245"
+ script="HELLO.sh"/>
+ </product>
+ <product name="PYHELLO"
+ type="component"
+ description="Example SALOME Python module: Hello.">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="104,260,2029"
+ script="PYHELLO.sh"/>
+ </product>
+ <product name="LIGHT"
+ type="component"
+ description="LIGHT (no-CORBA-engine) SALOME module example">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="208,221,2958"
+ script="LIGHT.sh"/>
+ </product>
+ <product name="PYLIGHT"
+ type="component"
+ description="LIGHT Python (no-CORBA-engine) SALOME module example">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="208,221,2958"
+ script="PYLIGHT.sh"/>
+ </product>
+ <product name="RANDOMIZER"
+ type="component"
+ description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="208,221,2958"
+ script="RANDOMIZER.sh"/>
+ </product>
+ <product name="SIERPINSKY"
+ type="component"
+ description="SALOME-based module implement simple interface to calculate Sierpinsky fields">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="208,221,2958"
+ script="SIERPINSKY.sh"/>
+ </product>
+ <product name="FILTER"
+ type="component"
+ description="Med Memory package">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="true"
+ installdiskspace="208,221,2958"
+ script="FILTER.sh"/>
+ </product>
+ <product name="MULTIPR"
+ type="component"
+ description="Partitioning/decimation module for the SALOME platform">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="208,221,2958"
+ script="MULTIPR.sh"/>
+ </product>
+ <product name="YACS"
+ type="component"
+ description="Tool to supervise execution of complex interconnected scientific applications">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="false"
+ installdiskspace="208,221,2958"
+ script="YACS.sh"/>
+ </product>
+ <product name="YACSGEN"
+ type="component"
+ description="Component and module generator for SALOME">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="1305,1489,1401"
+ script="YACSGEN.sh"/>
+ </product>
+ <product name="JOBMANAGER"
+ type="component"
+ description="Interface to use SALOME Launcher services">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="1305,1489,1401"
+ script="JOBMANAGER.sh"/>
+ </product>
+ <product name="SAMPLES"
+ type="component"
+ description="SALOME samples files">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="0,48711,0"
+ script="SAMPLES.sh"/>
+ </product>
+ <product name="xdata"
+ type="component"
+ description="Python module for types declaration in python classes">
+ <installation os="Debian 5.0 64bit"
+ version="0.7.3"
+ disable="false"
+ installdiskspace="5615,51450,17231"
+ script="xdata-0.7.3.sh"/>
+ </product>
+ <product name="HXX2SALOME"
+ type="component"
+ description="SALOME module generator">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="769,10242,14097"
+ script="HXX2SALOME.sh"/>
+ </product>
+ <product name="HXX2SALOMEDOC"
+ type="component"
+ description="SALOME module generator documentation">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ installdiskspace="9713,9691,19636"
+ script="HXX2SALOMEDOC.sh"/>
+ </product>
+
+ <product name="DOCUMENTATION"
+ type="component"
+ description="SALOME documentation">
+ <installation os="Debian 5.0 64bit"
+ version="5.1.4"
+ disable="false"
+ woguimode="true"
+ installdiskspace="0,205188,0"
+ script="DOCUMENTATION.sh"/>
+ </product>
+ <product name="tcltk"
+ type="prerequisite"
+ description="Tcl/Tk library">
+ <installation os="Debian 5.0 64bit"
+ version="8.4.14"
+ disable="false"
+ installdiskspace="10765,28789,50385"
+ script="tcltk-8.4.14.sh"/>
+ </product>
+ <product name="Python"
+ type="prerequisite"
+ description="Python language interpreter">
+ <installation os="Debian 5.0 64bit"
+ version="2.4.4"
+ disable="false"
+ installdiskspace="46479,32953,115859"
+ script="Python-2.4.4.sh"/>
+ </product>
+ <product name="Qt"
+ type="prerequisite"
+ description="Multiplatform C++ GUI application framework">
+ <installation os="Debian 5.0 64bit"
+ version="4.5.2"
+ disable="false"
+ installdiskspace="56161,63120,217501"
+ script="qt-4.5.2.sh"/>
+ </product>
+ <product name="QScintilla"
+ type="prerequisite"
+ description="Auxiliary tool for source code editing and debugging">
+ <installation os="Debian 5.0 64bit"
+ version="2.4"
+ disable="false"
+ installdiskspace="56161,63120,217501"
+ script="qscintilla-2.4.sh"/>
+ </product>
+ <product name="Sip"
+ type="prerequisite"
+ description="C++ to Python bindings generation tool">
+ <installation os="Debian 5.0 64bit"
+ version="4.8.2"
+ disable="false"
+ installdiskspace="308,1450,2476"
+ script="sip-4.8.2.sh"/>
+ </product>
+ <product name="PyQt"
+ type="prerequisite"
+ description="Python bindings for Qt library">
+ <installation os="Debian 5.0 64bit"
+ version="4.5.4"
+ disable="false"
+ installdiskspace="15914,3936,76034"
+ script="PyQt-4.5.4.sh"/>
+ </product>
+ <product name="boost"
+ type="prerequisite"
+ description="Free peer-reviewed portable STL extension">
+ <installation os="Debian 5.0 64bit"
+ version="1.40.0"
+ disable="false"
+ installdiskspace="30533,70205,100285"
+ script="BOOST-1.40.0.sh"/>
+ </product>
+ <product name="Swig"
+ type="prerequisite"
+ description="Simplified Wrapper and Interface Generator">
+ <installation os="Debian 5.0 64bit"
+ version="1.3.40"
+ disable="false"
+ installdiskspace="3923,11661,31647"
+ script="SWIG-1.3.40.sh"/>
+ </product>
+ <product name="OpenCascade"
+ type="prerequisite"
+ description="Open CASCADE version 6.3sp9">
+ <installation os="Debian 5.0 64bit"
+ version="6.3sp9"
+ disable="false"
+ installdiskspace="241631,268394,1222169"
+ script="CAS-6.3sp9.sh"/>
+ </product>
+ <product name="PatchForOpenCascade"
+ type="prerequisite"
+ description="Patch for Open CASCADE version 6.3sp9">
+ <installation os="Debian 5.0 64bit"
+ version="6.3sp9"
+ disable="true"
+ installdiskspace="241631,268394,1222169"
+ script="CAS-6.3sp9-patch.sh"/>
+ </product>
+ <product name="Qwt"
+ type="prerequisite"
+ description="2-D plotting extension for Qt library">
+ <installation os="Debian 5.0 64bit"
+ version="5.2.0"
+ disable="false"
+ installdiskspace="1034,7200,13134"
+ script="qwt-5.2.0.sh"/>
+ </product>
+ <product name="OmniORB"
+ type="prerequisite"
+ description="Open source Object Request Broker (ORB) library that implements the 2.3 specification of the Common Object Request Broker Architecture (CORBA)">
+ <installation os="Debian 5.0 64bit"
+ version="4.1.4"
+ disable="false"
+ installdiskspace="33506,14551,105946"
+ script="omniORB-4.1.4.sh"/>
+ </product>
+ <product name="Hdf"
+ type="prerequisite"
+ description="Hierarchical Data Format library">
+ <installation os="Debian 5.0 64bit"
+ version="5-1.6.9"
+ disable="false"
+ installdiskspace="3291,26859,49771"
+ script="hdf5-1.6.9.sh"/>
+ </product>
+ <product name="Med"
+ type="prerequisite"
+ description="MED format interface library">
+ <installation os="Debian 5.0 64bit"
+ version="2.3.6"
+ disable="false"
+ installdiskspace="19544,6445,63656"
+ script="med-2.3.6.sh"/>
+ </product>
+ <product name="Metis"
+ type="prerequisite"
+ description="Software package for partitioning unstructured graphs, partitioning meshes, and computing fill-reducing orderings of sparse matrices">
+ <installation os="Debian 5.0 64bit"
+ version="4.0"
+ disable="false"
+ installdiskspace="19544,6445,63656"
+ script="metis-4.0.sh"/>
+ </product>
+ <product name="Scotch"
+ type="prerequisite"
+ description="Software package and library devoted to static mapping, partitioning and sparce matrix block ordering og graph and meshes">
+ <installation os="Debian 5.0 64bit"
+ version="4.0"
+ disable="false"
+ installdiskspace="19544,6445,63656"
+ script="scotch-4.0.sh"/>
+ </product>
+ <product name="cmake"
+ type="prerequisite"
+ description="The cross-platform, open-source make system">
+ <installation os="Debian 5.0 64bit"
+ version="2.6.4"
+ disable="false"
+ installdiskspace="37844,38843,234392"
+ script="cmake-2.6.4.sh"/>
+ </product>
+ <product name="Vtk"
+ type="prerequisite"
+ description="Image processing, 3D graphics and visualization software system">
+ <installation os="Debian 5.0 64bit"
+ version="5.0.4"
+ disable="false"
+ installdiskspace="37844,38843,234392"
+ script="VTK-5.0.4.sh"/>
+ </product>
+ <product name="numpy"
+ type="prerequisite"
+ description="Fundamental package for scientific computing with Python">
+ <installation os="Debian 5.0 64bit"
+ version="1.3.0"
+ disable="false"
+ installdiskspace="1669,3279,8181"
+ script="numpy-1.3.0.sh"/>
+ </product>
+ <product name="libBatch"
+ type="prerequisite"
+ description="Generic batch management library">
+ <installation os="Debian 5.0 64bit"
+ version="1.1.0"
+ disable="false"
+ installdiskspace="1305,1489,1401"
+ script="libBatch-1.1.0.sh"/>
+ </product>
+ <product name="expat"
+ type="prerequisite"
+ description="C library for parsing XML">
+ <installation os="Debian 5.0 64bit"
+ version="2.0.1"
+ disable="false"
+ installdiskspace="1115,1233,5108"
+ script="expat-2.0.1.sh"/>
+ </product>
+ <product name="Graphviz"
+ type="prerequisite"
+ description="Graph Drawing Programs set">
+ <installation os="Debian 5.0 64bit"
+ version="2.24.0"
+ disable="false"
+ installdiskspace="10257,15158,54597"
+ script="graphviz-2.24.0.sh"/>
+ </product>
+ <product name="Doxygen"
+ type="prerequisite"
+ description="Documentation system for C++, C, Java, IDL, etc.">
+ <installation os="Debian 5.0 64bit"
+ version="1.6.1"
+ disable="false"
+ installdiskspace="8265,12671,46325"
+ script="doxygen-1.6.1.sh"/>
+ </product>
+ <product name="docutils"
+ type="prerequisite"
+ description="Utilites for processing plaintext documentation">
+ <installation os="Debian 5.0 64bit"
+ version="0.6.0"
+ disable="false"
+ installdiskspace="2163,3342,6310"
+ script="docutils-0.6.0.sh"/>
+ </product>
+ <product name="Sphinx"
+ type="prerequisite"
+ description="Tool for creation of documentation for Python projects">
+ <installation os="Debian 5.0 64bit"
+ version="0.6.3"
+ disable="false"
+ installdiskspace="2163,3342,6310"
+ script="sphinx-0.6.3.sh"/>
+ </product>
+ <product name="netgen"
+ type="prerequisite"
+ description="Quadrangle meshing algorithmic tool">
+ <installation os="Debian 5.0 64bit"
+ version="4.5"
+ disable="false"
+ installdiskspace="5615,51450,17231"
+ script="netgen-4.5.sh"/>
+ </product>
+ <product name="DISTENE"
+ type="prerequisite"
+ description="DISTENE meshing tools">
+ <installation os="Debian 5.0 64bit"
+ version=""
+ disable="false"
+ installdiskspace="5615,51450,17231"
+ script="DISTENE.sh"/>
+ </product>
+ <product name="TetMesh-GHS3D"
+ type="prerequisite"
+ description="An automatic tetrahedral mesh generator">
+ <installation os="Debian 5.0 64bit"
+ version="4.0"
+ disable="true"
+ installdiskspace="5615,51450,17231"
+ script="ghs3d-4.0.sh"/>
+ </product>
+ <product name="BLSurf"
+ type="prerequisite"
+ description="An automatic composite surface mesh generator">
+ <installation os="Debian 5.0 64bit"
+ version="2.7.12"
+ disable="true"
+ installdiskspace="5615,51450,17231"
+ script="blsurf-2.7.12.sh"/>
+ </product>
+ <product name="libxml2"
+ type="prerequisite"
+ description="XML C parser">
+ <installation os="Debian 5.0 64bit"
+ version="2.7.7"
+ disable="false"
+ installdiskspace="5615,51450,17231"
+ script="libxml2-2.7.7.sh"/>
+ </product>
+ </products>
+ <dependencies>
+ <product name="KERNEL">
+ <dep>boost</dep>
+ <dep>Python</dep>
+ <dep>numpy</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>libxml2</dep>
+ <dep>libBatch</dep>
+ </product>
+ <product name="GUI">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Qwt</dep>
+ <dep>Hdf</dep>
+ <dep>Vtk</dep>
+ <dep>OmniORB</dep>
+ <dep>Sip</dep>
+ <dep>PyQt</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>libxml2</dep>
+ <dep>KERNEL</dep>
+ </product>
+ <product name="GEOM">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="MED">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>Metis</dep>
+ <dep>Scotch</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>libxml2</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="SMESH">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="VISU">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Qwt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>Vtk</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="NETGENPLUGIN">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>netgen</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>MED</dep>
+ <dep>SMESH</dep>
+ </product>
+ <product name="GHS3DPLUGIN">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>DISTENE</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>SMESH</dep>
+ </product>
+ <product name="GHS3DPRLPLUGIN">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>DISTENE</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>MED</dep>
+ <dep>SMESH</dep>
+ </product>
+ <product name="BLSURFPLUGIN">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>DISTENE</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>MED</dep>
+ <dep>SMESH</dep>
+ </product>
+ <product name="HexoticPLUGIN">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Hdf</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>GEOM</dep>
+ <dep>MED</dep>
+ <dep>SMESH</dep>
+ </product>
+ <product name="COMPONENT">
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Qwt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>Vtk</dep>
+ <dep>OmniORB</dep>
+ <dep>Sip</dep>
+ <dep>PyQt</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="PYCALCULATOR">
+ <dep>Python</dep>
+ <dep>OmniORB</dep>
+ <dep>Med</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="CALCULATOR">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>OmniORB</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="HELLO">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>OmniORB</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="PYHELLO">
+ <dep>Python</dep>
+ <dep>OmniORB</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="LIGHT">
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>Hdf</dep>
+ <dep>Vtk</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="PYLIGHT">
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>Hdf</dep>
+ <dep>Vtk</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="RANDOMIZER">
+ <dep>Python</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="SIERPINSKY">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>Vtk</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ <dep>VISU</dep>
+ <dep>RANDOMIZER</dep>
+ </product>
+ <product name="FILTER">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>Qt</dep>
+ <dep>Qwt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>Vtk</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="MULTIPR">
+ <dep>boost</dep>
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>Hdf</dep>
+ <dep>Med</dep>
+ <dep>OmniORB</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ </product>
+ <product name="YACS">
+ <dep>OpenCascade</dep>
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>OmniORB</dep>
+ <dep>Doxygen</dep>
+ <dep>Graphviz</dep>
+ <dep>docutils</dep>
+ <dep>Sphinx</dep>
+ <dep>QScintilla</dep>
+ <dep>libxml2</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="QScintilla">
+ <dep>Qt</dep>
+ </product>
+ <product name="Sphinx">
+ <dep>Python</dep>
+ </product>
+ <product name="Sip">
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ </product>
+ <product name="PyQt">
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>Sip</dep>
+ </product>
+ <product name="boost">
+ <dep>Python</dep>
+ </product>
+ <product name="Swig">
+ <dep>Python</dep>
+ <dep>tcltk</dep>
+ </product>
+ <product name="OpenCascade">
+ <dep>tcltk</dep>
+ </product>
+ <product name="PatchForOpenCascade">
+ <dep>OpenCascade</dep>
+ </product>
+ <product name="Qwt">
+ <dep>Qt</dep>
+ </product>
+ <product name="OmniORB">
+ <dep>Python</dep>
+ </product>
+ <product name="Med">
+ <dep>Hdf</dep>
+ </product>
+ <product name="Vtk">
+ <dep>Python</dep>
+ <dep>tcltk</dep>
+ <dep>cmake</dep>
+ </product>
+ <product name="numpy">
+ <dep>Python</dep>
+ </product>
+ <product name="Graphviz">
+ <dep>Python</dep>
+ <dep>tcltk</dep>
+ <dep>Swig</dep>
+ <dep>expat</dep>
+ </product>
+ <product name="Doxygen">
+ <dep>Graphviz</dep>
+ </product>
+ <product name="docutils">
+ <dep>Python</dep>
+ </product>
+ <product name="libxml2">
+ <dep>Python</dep>
+ </product>
+ <product name="netgen">
+ <dep>OpenCascade</dep>
+ </product>
+ <product name="libBatch">
+ <dep>Python</dep>
+ <dep>Swig</dep>
+ <dep>cmake</dep>
+ </product>
+ <product name="YACSGEN">
+ <dep>Python</dep>
+ </product>
+ <product name="JOBMANAGER">
+ <dep>Qt</dep>
+ <dep>OmniORB</dep>
+ <dep>Sphinx</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ </product>
+ <product name="xdata">
+ <dep>Python</dep>
+ <dep>Qt</dep>
+ <dep>PyQt</dep>
+ <dep>OmniORB</dep>
+ <dep>Vtk</dep>
+ <dep>KERNEL</dep>
+ <dep>GUI</dep>
+ <dep>MED</dep>
+ <dep>GEOM</dep>
+ </product>
+ <product name="HXX2SALOME">
+ <dep>Qt</dep>
+ <dep>HXX2SALOMEDOC</dep>
+ </product>
+ </dependencies>
+
+</document>
-diff -Naur netgen-4.5.old/libsrc/csg/meshsurf.cpp netgen-4.5.new/libsrc/csg/meshsurf.cpp
---- netgen-4.5.old/libsrc/csg/meshsurf.cpp 2006-02-14 11:54:35.000000000 +0300
-+++ netgen-4.5.new/libsrc/csg/meshsurf.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/algprim.cpp netgen-4.5_new/libsrc/csg/algprim.cpp
+--- netgen-4.5_orig/libsrc/csg/algprim.cpp 2006-01-25 16:30:28.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/algprim.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -108,7 +108,7 @@
+ void Plane :: GetPrimitiveData (char *& classname,
+ ARRAY<double> & coeffs) const
+ {
+- classname = "plane";
++ classname = (char*)"plane";
+ coeffs.SetSize (6);
+ coeffs.Elem(1) = p(0);
+ coeffs.Elem(2) = p(1);
+@@ -355,7 +355,7 @@
+
+ void Sphere :: GetPrimitiveData (char *& classname, ARRAY<double> & coeffs) const
+ {
+- classname = "sphere";
++ classname = (char*)"sphere";
+ coeffs.SetSize (4);
+ coeffs.Elem(1) = c(0);
+ coeffs.Elem(2) = c(1);
+@@ -760,7 +760,7 @@
+
+ void Cylinder :: GetPrimitiveData (char *& classname, ARRAY<double> & coeffs) const
+ {
+- classname = "cylinder";
++ classname = (char*)"cylinder";
+ coeffs.SetSize (7);
+ coeffs.Elem(1) = a(0);
+ coeffs.Elem(2) = a(1);
+@@ -1243,7 +1243,7 @@
+
+ void Cone :: GetPrimitiveData (char *& classname, ARRAY<double> & coeffs) const
+ {
+- classname = "cone";
++ classname = (char*)"cone";
+ coeffs.SetSize (8);
+ coeffs.Elem(1) = a(0);
+ coeffs.Elem(2) = a(1);
+@@ -1446,7 +1446,7 @@
+
+ void Torus :: GetPrimitiveData (char *& classname, ARRAY<double> & coeffs) const
+ {
+- classname = "torus";
++ classname = (char*)"torus";
+ coeffs.SetSize (8);
+ coeffs.Elem(1) = c(0);
+ coeffs.Elem(2) = c(1);
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/brick.cpp netgen-4.5_new/libsrc/csg/brick.cpp
+--- netgen-4.5_orig/libsrc/csg/brick.cpp 2006-02-08 15:23:15.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/brick.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -345,7 +345,7 @@
+ void Brick ::
+ GetPrimitiveData (char *& classname, ARRAY<double> & coeffs) const
+ {
+- classname = "brick";
++ classname = (char*)"brick";
+ coeffs.SetSize(12);
+ coeffs.Elem(1) = p1(0);
+ coeffs.Elem(2) = p1(1);
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/meshsurf.cpp netgen-4.5_new/libsrc/csg/meshsurf.cpp
+--- netgen-4.5_orig/libsrc/csg/meshsurf.cpp 2006-02-14 11:54:35.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/meshsurf.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -77,11 +77,12 @@
}
}
void MeshOptimize2dSurfaces :: ProjectPoint2 (INDEX surfind, INDEX surfind2,
-diff -Naur netgen-4.5.old/libsrc/csg/meshsurf.hpp netgen-4.5.new/libsrc/csg/meshsurf.hpp
---- netgen-4.5.old/libsrc/csg/meshsurf.hpp 2004-01-20 14:49:44.000000000 +0300
-+++ netgen-4.5.new/libsrc/csg/meshsurf.hpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/meshsurf.hpp netgen-4.5_new/libsrc/csg/meshsurf.hpp
+--- netgen-4.5_orig/libsrc/csg/meshsurf.hpp 2004-01-20 14:49:44.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/meshsurf.hpp 2010-11-25 10:11:30.000000000 +0300
@@ -45,7 +45,7 @@
MeshOptimize2dSurfaces (const CSGeometry & ageometry);
///
virtual void ProjectPoint2 (INDEX surfind, INDEX surfind2, Point3d & p) const;
///
-diff -Naur netgen-4.5.old/libsrc/general/profiler.cpp netgen-4.5.new/libsrc/general/profiler.cpp
---- netgen-4.5.old/libsrc/general/profiler.cpp 2006-01-11 13:05:59.000000000 +0300
-+++ netgen-4.5.new/libsrc/general/profiler.cpp 2009-06-11 17:58:07.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/polyhedra.cpp netgen-4.5_new/libsrc/csg/polyhedra.cpp
+--- netgen-4.5_orig/libsrc/csg/polyhedra.cpp 2006-02-09 13:33:11.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/polyhedra.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -287,7 +287,7 @@
+ void Polyhedra :: GetPrimitiveData (char *& classname,
+ ARRAY<double> & coeffs) const
+ {
+- classname = "Polyhedra";
++ classname = (char*)"Polyhedra";
+ coeffs.SetSize(0);
+ coeffs.Append (points.Size());
+ coeffs.Append (faces.Size());
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/csg/surface.cpp netgen-4.5_new/libsrc/csg/surface.cpp
+--- netgen-4.5_orig/libsrc/csg/surface.cpp 2006-02-08 15:23:16.000000000 +0300
++++ netgen-4.5_new/libsrc/csg/surface.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -215,7 +215,7 @@
+ void Primitive :: GetPrimitiveData (char *& classname,
+ ARRAY<double> & coeffs) const
+ {
+- classname = "undef";
++ classname = (char*)"undef";
+ coeffs.SetSize (0);
+ }
+
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/general/profiler.cpp netgen-4.5_new/libsrc/general/profiler.cpp
+--- netgen-4.5_orig/libsrc/general/profiler.cpp 2006-01-11 13:05:59.000000000 +0300
++++ netgen-4.5_new/libsrc/general/profiler.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -34,8 +34,14 @@
{
StopTimer (total_timer);
}
-diff -Naur netgen-4.5.old/libsrc/interface/Makefile netgen-4.5.new/libsrc/interface/Makefile
---- netgen-4.5.old/libsrc/interface/Makefile 2005-08-09 18:14:59.000000000 +0400
-+++ netgen-4.5.new/libsrc/interface/Makefile 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/geom2d/genmesh2d.cpp netgen-4.5_new/libsrc/geom2d/genmesh2d.cpp
+--- netgen-4.5_orig/libsrc/geom2d/genmesh2d.cpp 2006-02-16 19:17:47.000000000 +0300
++++ netgen-4.5_new/libsrc/geom2d/genmesh2d.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -121,11 +121,11 @@
+
+ int hsteps = mp.optsteps2d;
+
+- mp.optimize2d = "smcm";
++ mp.optimize2d = (char*)"smcm";
+ mp.optsteps2d = hsteps/2;
+ Optimize2d (*mesh, mp);
+
+- mp.optimize2d = "Smcm";
++ mp.optimize2d = (char*)"Smcm";
+ mp.optsteps2d = (hsteps+1)/2;
+ Optimize2d (*mesh, mp);
+
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/gprim/geom2d.hpp netgen-4.5_new/libsrc/gprim/geom2d.hpp
+--- netgen-4.5_orig/libsrc/gprim/geom2d.hpp 2004-01-20 14:49:44.000000000 +0300
++++ netgen-4.5_new/libsrc/gprim/geom2d.hpp 2010-11-25 10:11:30.000000000 +0300
+@@ -53,7 +53,7 @@
+ int IsOnLongLine (const Line2d & l, const Point2d & p);
+ int Hit (const Line2d & l1, const Line2d & l2, double heps = EPSGEOM);
+ ostream & operator<<(ostream & s, const Line2d & l);
+-Point2d CrossPoint (const PLine2d & l1, const PLine2d & l2);
++Point2d CrossPoint (const Line2d & l1, const Line2d & l2);
+ int Parallel (const PLine2d & l1, const PLine2d & l2, double peps = EPSGEOM);
+ int IsOnLine (const PLine2d & l, const Point2d & p, double heps = EPSGEOM);
+ int IsOnLongLine (const PLine2d & l, const Point2d & p);
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/gprim/geom3d.hpp netgen-4.5_new/libsrc/gprim/geom3d.hpp
+--- netgen-4.5_orig/libsrc/gprim/geom3d.hpp 2004-08-30 16:04:04.000000000 +0400
++++ netgen-4.5_new/libsrc/gprim/geom3d.hpp 2010-11-25 10:11:30.000000000 +0300
+@@ -25,6 +25,7 @@
+ inline Point3d Center (const Point3d & p1, const Point3d & p2, const Point3d & p3);
+ inline Point3d Center (const Point3d & p1, const Point3d & p2,
+ const Point3d & p3, const Point3d & p4);
++inline double Dist2 (const Point3d & p1, const Point3d & p2);
+ ostream & operator<<(ostream & s, const Point3d & p);
+ inline Vec3d operator- (const Vec3d & p1, const Vec3d & v);
+ inline Vec3d operator+ (const Vec3d & p1, const Vec3d & v);
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/include/mystdlib.h netgen-4.5_new/libsrc/include/mystdlib.h
+--- netgen-4.5_orig/libsrc/include/mystdlib.h 2006-01-16 17:16:56.000000000 +0300
++++ netgen-4.5_new/libsrc/include/mystdlib.h 2010-11-25 10:11:30.000000000 +0300
+@@ -25,6 +25,7 @@
+ #include <cmath>\r
+ #include <cctype>\r
+ #include <ctime>\r
++#include <cstring>\r
+ #endif\r
+ \r
+ \r
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/interface/Makefile netgen-4.5_new/libsrc/interface/Makefile
+--- netgen-4.5_orig/libsrc/interface/Makefile 2005-08-09 18:14:59.000000000 +0400
++++ netgen-4.5_new/libsrc/interface/Makefile 2010-11-25 10:11:30.000000000 +0300
@@ -1,4 +1,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
+#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
#
lib = nginterface
libpath = libsrc/interface
-diff -Naur netgen-4.5.old/libsrc/interface/nglib.cpp netgen-4.5.new/libsrc/interface/nglib.cpp
---- netgen-4.5.old/libsrc/interface/nglib.cpp 2005-10-18 17:53:18.000000000 +0400
-+++ netgen-4.5.new/libsrc/interface/nglib.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/interface/nglib.cpp netgen-4.5_new/libsrc/interface/nglib.cpp
+--- netgen-4.5_orig/libsrc/interface/nglib.cpp 2005-10-18 17:53:18.000000000 +0400
++++ netgen-4.5_new/libsrc/interface/nglib.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -56,7 +56,8 @@
void Ng_Exit ()
}
-diff -Naur netgen-4.5.old/libsrc/makefile.inc netgen-4.5.new/libsrc/makefile.inc
---- netgen-4.5.old/libsrc/makefile.inc 2005-09-02 17:17:51.000000000 +0400
-+++ netgen-4.5.new/libsrc/makefile.inc 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/interface/writeuser.cpp netgen-4.5_new/libsrc/interface/writeuser.cpp
+--- netgen-4.5_orig/libsrc/interface/writeuser.cpp 2005-08-09 18:14:59.000000000 +0400
++++ netgen-4.5_new/libsrc/interface/writeuser.cpp 2010-11-25 10:11:30.000000000 +0300
+@@ -17,7 +17,7 @@
+
+ void RegisterUserFormats (ARRAY<const char*> & names)
+ {
+- char *types[] =
++ const char *types[] =
+ {
+ "Neutral Format",
+ "Surface Mesh Format" ,
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/linalg/densemat.hpp netgen-4.5_new/libsrc/linalg/densemat.hpp
+--- netgen-4.5_orig/libsrc/linalg/densemat.hpp 2005-12-09 15:26:19.000000000 +0300
++++ netgen-4.5_new/libsrc/linalg/densemat.hpp 2010-11-25 10:11:30.000000000 +0300
+@@ -14,6 +14,8 @@
+
+ #include <assert.h>
+
++class DenseMatrix;
++void CalcAtA (const DenseMatrix & a, DenseMatrix & m2);
+
+ class DenseMatrix
+ {
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/makefile.inc netgen-4.5_new/libsrc/makefile.inc
+--- netgen-4.5_orig/libsrc/makefile.inc 2005-09-02 17:17:51.000000000 +0400
++++ netgen-4.5_new/libsrc/makefile.inc 2010-11-25 10:11:30.000000000 +0300
@@ -8,17 +8,14 @@
LIBSRC_DIR=$(CPP_DIR)/libsrc
LIB_DIR=$(CPP_DIR)/lib/$(MACHINE)
#
ARFLAGS = r
#
-diff -Naur netgen-4.5.old/libsrc/makefile.mach.LINUX netgen-4.5.new/libsrc/makefile.mach.LINUX
---- netgen-4.5.old/libsrc/makefile.mach.LINUX 2004-10-11 23:49:26.000000000 +0400
-+++ netgen-4.5.new/libsrc/makefile.mach.LINUX 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/makefile.mach.LINUX netgen-4.5_new/libsrc/makefile.mach.LINUX
+--- netgen-4.5_orig/libsrc/makefile.mach.LINUX 2004-10-11 23:49:26.000000000 +0400
++++ netgen-4.5_new/libsrc/makefile.mach.LINUX 2010-11-25 10:11:30.000000000 +0300
@@ -16,7 +16,7 @@
#
CFLAGS2 =
-ftemplate-depth-99 -finline-limit=10000 \
-Wdisabled-optimization -funroll-loops -DnoNGSOLVE
-diff -Naur netgen-4.5.old/libsrc/meshing/improve2.cpp netgen-4.5.new/libsrc/meshing/improve2.cpp
---- netgen-4.5.old/libsrc/meshing/improve2.cpp 2006-01-11 19:08:19.000000000 +0300
-+++ netgen-4.5.new/libsrc/meshing/improve2.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/meshing/improve2.cpp netgen-4.5_new/libsrc/meshing/improve2.cpp
+--- netgen-4.5_orig/libsrc/meshing/improve2.cpp 2006-01-11 19:08:19.000000000 +0300
++++ netgen-4.5_new/libsrc/meshing/improve2.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -4,7 +4,7 @@
#include <opti.hpp>
#endif
namespace netgen
-diff -Naur netgen-4.5.old/libsrc/meshing/improve2.hpp netgen-4.5.new/libsrc/meshing/improve2.hpp
---- netgen-4.5.old/libsrc/meshing/improve2.hpp 2004-10-12 23:22:55.000000000 +0400
-+++ netgen-4.5.new/libsrc/meshing/improve2.hpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/meshing/improve2.hpp netgen-4.5_new/libsrc/meshing/improve2.hpp
+--- netgen-4.5_orig/libsrc/meshing/improve2.hpp 2004-10-12 23:22:55.000000000 +0400
++++ netgen-4.5_new/libsrc/meshing/improve2.hpp 2010-11-25 10:11:30.000000000 +0300
@@ -32,17 +32,16 @@
///
virtual void SelectSurfaceOfPoint (const Point3d & p,
///
virtual void GetNormalVector(INDEX surfind, const Point3d & p, PointGeomInfo & gi, Vec3d & n) const;
-diff -Naur netgen-4.5.old/libsrc/meshing/meshtype.cpp netgen-4.5.new/libsrc/meshing/meshtype.cpp
---- netgen-4.5.old/libsrc/meshing/meshtype.cpp 2006-02-10 13:11:08.000000000 +0300
-+++ netgen-4.5.new/libsrc/meshing/meshtype.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/meshing/meshtype.cpp netgen-4.5_new/libsrc/meshing/meshtype.cpp
+--- netgen-4.5_orig/libsrc/meshing/meshtype.cpp 2006-02-10 13:11:08.000000000 +0300
++++ netgen-4.5_new/libsrc/meshing/meshtype.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -1,4 +1,5 @@
#include <mystdlib.h>
+#include <float.h>
err += 1e12;
else
err += frob * frob / det;
-diff -Naur netgen-4.5.old/libsrc/meshing/meshtype.hpp netgen-4.5.new/libsrc/meshing/meshtype.hpp
---- netgen-4.5.old/libsrc/meshing/meshtype.hpp 2006-02-10 13:11:08.000000000 +0300
-+++ netgen-4.5.new/libsrc/meshing/meshtype.hpp 2009-06-11 17:56:43.000000000 +0400
+@@ -2222,9 +2223,9 @@
+
+ MeshingParameters :: MeshingParameters ()
+ {
+- optimize3d = "cmdmstm";
++ optimize3d = (char*)"cmdmstm";
+ optsteps3d = 3;
+- optimize2d = "smsmsmSmSmSm";
++ optimize2d = (char*)"smsmsmSmSmSm";
+ optsteps2d = 3;
+ opterrpow = 2;
+ blockfill = 1;
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/meshing/meshtype.hpp netgen-4.5_new/libsrc/meshing/meshtype.hpp
+--- netgen-4.5_orig/libsrc/meshing/meshtype.hpp 2006-02-10 13:11:08.000000000 +0300
++++ netgen-4.5_new/libsrc/meshing/meshtype.hpp 2010-11-25 10:11:30.000000000 +0300
@@ -13,7 +13,7 @@
Classes for NETGEN
*/
enum ELEMENT_TYPE {
SEGMENT = 1, SEGMENT3 = 2,
TRIG = 10, QUAD=11, TRIG6 = 12, QUAD6 = 13, QUAD8 = 14,
-diff -Naur netgen-4.5.old/libsrc/meshing/smoothing2.cpp netgen-4.5.new/libsrc/meshing/smoothing2.cpp
---- netgen-4.5.old/libsrc/meshing/smoothing2.cpp 2006-01-11 19:08:20.000000000 +0300
-+++ netgen-4.5.new/libsrc/meshing/smoothing2.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/meshing/smoothing2.cpp netgen-4.5_new/libsrc/meshing/smoothing2.cpp
+--- netgen-4.5_orig/libsrc/meshing/smoothing2.cpp 2006-01-11 19:08:20.000000000 +0300
++++ netgen-4.5_new/libsrc/meshing/smoothing2.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -300,7 +300,7 @@
double Opti2SurfaceMinFunction ::
FuncGrad (const Vector & x, Vector & grad) const
if (moveisok)
{
for (j = 0; j < locelements.Size(); j++)
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Inter2d.cxx netgen-4.5.new/libsrc/occ/Partition_Inter2d.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Inter2d.cxx 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Inter2d.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Inter2d.cxx netgen-4.5_new/libsrc/occ/Partition_Inter2d.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Inter2d.cxx 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Inter2d.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -29,10 +29,10 @@
// $Header$
#include <BRepAdaptor_Curve.hxx>
#include <BRepAlgo_AsDes.hxx>
#include <BRepLib_MakeVertex.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Inter3d.cxx netgen-4.5.new/libsrc/occ/Partition_Inter3d.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Inter3d.cxx 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Inter3d.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Inter3d.cxx netgen-4.5_new/libsrc/occ/Partition_Inter3d.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Inter3d.cxx 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Inter3d.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -29,13 +29,17 @@
// $Header$
#include <BRepOffset_Tool.hxx>
#include <BRep_Builder.hxx>
#include <BRep_Tool.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Loop.cxx netgen-4.5.new/libsrc/occ/Partition_Loop.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Loop.cxx 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Loop.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Loop.cxx netgen-4.5_new/libsrc/occ/Partition_Loop.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Loop.cxx 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Loop.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -29,12 +29,14 @@
// $Header$
#include <BRep_Builder.hxx>
#include <BRepAlgo_FaceRestrictor.hxx>
#include <BRep_Tool.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Loop2d.cxx netgen-4.5.new/libsrc/occ/Partition_Loop2d.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Loop2d.cxx 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Loop2d.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Loop2d.cxx netgen-4.5_new/libsrc/occ/Partition_Loop2d.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Loop2d.cxx 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Loop2d.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -12,9 +12,11 @@
// $Header$
#include <stdio.h>
#include <BRepAdaptor_Curve2d.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Loop3d.cxx netgen-4.5.new/libsrc/occ/Partition_Loop3d.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Loop3d.cxx 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Loop3d.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Loop3d.cxx netgen-4.5_new/libsrc/occ/Partition_Loop3d.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Loop3d.cxx 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Loop3d.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -10,6 +10,11 @@
// Module : GEOM
#include "Partition_Loop3d.ixx"
#include <TopExp_Explorer.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/Partition_Spliter.cxx netgen-4.5.new/libsrc/occ/Partition_Spliter.cxx
---- netgen-4.5.old/libsrc/occ/Partition_Spliter.cxx 2005-07-11 10:33:27.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/Partition_Spliter.cxx 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/Partition_Spliter.cxx netgen-4.5_new/libsrc/occ/Partition_Spliter.cxx
+--- netgen-4.5_orig/libsrc/occ/Partition_Spliter.cxx 2005-07-11 10:33:27.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/Partition_Spliter.cxx 2010-11-25 10:11:31.000000000 +0300
@@ -29,14 +29,15 @@
// $Header$
#include <Precision.hxx>
#include <TopAbs_Orientation.hxx>
#include <TopExp.hxx>
-diff -Naur netgen-4.5.old/libsrc/occ/occconstruction.cpp netgen-4.5.new/libsrc/occ/occconstruction.cpp
---- netgen-4.5.old/libsrc/occ/occconstruction.cpp 2005-12-06 18:15:53.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/occconstruction.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occconstruction.cpp netgen-4.5_new/libsrc/occ/occconstruction.cpp
+--- netgen-4.5_orig/libsrc/occ/occconstruction.cpp 2005-12-06 18:15:53.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/occconstruction.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -28,8 +28,8 @@
#include <BRepAlgoAPI_Common.hxx>
#include <BRepAlgoAPI_Fuse.hxx>
#include <BRepOffsetAPI_MakeOffsetShape.hxx>
#include <ShapeFix_Shape.hxx>
namespace netgen
-diff -Naur netgen-4.5.old/libsrc/occ/occgenmesh.cpp netgen-4.5.new/libsrc/occ/occgenmesh.cpp
---- netgen-4.5.old/libsrc/occ/occgenmesh.cpp 2006-02-07 13:12:48.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/occgenmesh.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occgenmesh.cpp netgen-4.5_new/libsrc/occ/occgenmesh.cpp
+--- netgen-4.5_orig/libsrc/occ/occgenmesh.cpp 2006-02-07 13:12:48.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/occgenmesh.cpp 2010-11-25 10:11:30.000000000 +0300
@@ -28,7 +28,7 @@
return Point<3> (p.X(), p.Y(), p.Z());
}
ARRAY<MeshPoint> & ps,
ARRAY<double> & params,
Mesh & mesh)
-@@ -49,23 +49,19 @@
+@@ -49,23 +49,18 @@
hvalue[0] = 0;
pnt = c->Value(s0);
{
oldpnt = pnt;
pnt = c->Value(s0+(i/double(DIVIDEEDGESECTIONS))*(s1-s0));
-+ double dist = pnt.Distance(oldpnt);
- hvalue[i] = hvalue[i-1] +
- 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
+- hvalue[i] = hvalue[i-1] +
+- 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*
- pnt.Distance(oldpnt);
-+ dist;
++ double dist = pnt.Distance(oldpnt);
++ hvalue[i] = hvalue[i-1] + min( 1.0,
++ 1.0/mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))*dist);
//(*testout) << "mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z())) " << mesh.GetH(Point3d(pnt.X(), pnt.Y(), pnt.Z()))
// << " pnt.Distance(oldpnt) " << pnt.Distance(oldpnt) << endl;
}
// nsubedges = int(ceil(hvalue[DIVIDEEDGESECTIONS]));
-@@ -74,7 +70,7 @@
+@@ -74,13 +69,16 @@
ps.SetSize(nsubedges-1);
params.SetSize(nsubedges+1);
int i1 = 0;
do
{
-@@ -112,7 +108,7 @@
+ if (hvalue[i1]/hvalue[DIVIDEEDGESECTIONS]*nsubedges >= i)
+ {
+- params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);
++ // EAP. For nsubedges comparable to DIVIDEEDGESECTIONS (issue 0021073)
++ double d1 = i1 - (hvalue[i1] - i*hvalue[DIVIDEEDGESECTIONS]/nsubedges)/(hvalue[i1]-hvalue[i1-1]);
++ params[i] = s0+(d1/double(DIVIDEEDGESECTIONS))*(s1-s0);
++ //params[i] = s0+(i1/double(DIVIDEEDGESECTIONS))*(s1-s0);
+ pnt = c->Value(params[i]);
+ ps[i-1] = MeshPoint (Point3d(pnt.X(), pnt.Y(), pnt.Z()));
+ i++;
+@@ -112,7 +110,7 @@
static void FindEdges (OCCGeometry & geom, Mesh & mesh)
{
multithread.task = "Edge meshing";
(*testout) << "edge meshing" << endl;
-@@ -124,6 +120,7 @@
+@@ -124,6 +122,7 @@
(*testout) << "nedges = " << nedges << endl;
double eps = 1e-6 * geom.GetBoundingBox().Diam();
for (int i = 1; i <= nvertices; i++)
{
-@@ -133,7 +130,7 @@
+@@ -133,7 +132,7 @@
bool exists = 0;
if (merge_solids)
for (PointIndex pi = 1; pi <= mesh.GetNP(); pi++)
{
exists = 1;
break;
-@@ -163,6 +160,7 @@
+@@ -163,6 +162,7 @@
{
TopoDS_Face face = TopoDS::Face(exp1.Current());
int facenr = geom.fmap.FindIndex(face);
if (face2solid[0][facenr-1] == 0)
face2solid[0][facenr-1] = solidnr;
-@@ -184,6 +182,9 @@
+@@ -184,6 +184,9 @@
int facenr = 0;
int edgenr = 0;
(*testout) << "faces = " << geom.fmap.Extent() << endl;
int curr = 0;
-@@ -232,6 +233,11 @@
+@@ -232,6 +235,11 @@
continue;
}
if (geom.vmap.FindIndex(TopExp::FirstVertex (edge)) ==
geom.vmap.FindIndex(TopExp::LastVertex (edge)))
{
-@@ -276,8 +282,8 @@
+@@ -276,8 +284,8 @@
pnums.Last() = -1;
for (PointIndex pi = 1; pi < first_ep; pi++)
{
}
}
-@@ -287,7 +293,7 @@
+@@ -287,7 +295,7 @@
bool exists = 0;
int j;
for (j = first_ep; j <= mesh.GetNP(); j++)
{
exists = 1;
break;
-@@ -394,7 +400,7 @@
+@@ -394,7 +402,7 @@
int i, j, k;
int changed;
multithread.task = "Surface meshing";
geom.facemeshstatus = 0;
-@@ -751,7 +757,7 @@
+@@ -751,7 +759,7 @@
multithread.task = savetask;
}
{
double hret;
kappa *= mparam.curvaturesafety;
-@@ -779,7 +785,7 @@
+@@ -779,7 +787,7 @@
double nq = n*q;
Point<3> p = p0 + 0.5*n;
if (lambda >= 0 && lambda <= 1)
{
-@@ -799,55 +805,55 @@
+@@ -799,55 +807,55 @@
//(*testout) << "curvature " << curvature << endl;
-@@ -886,51 +892,47 @@
+@@ -886,51 +894,47 @@
pm1.SetX(0.5*(par0.X()+par2.X())); pm1.SetY(0.5*(par0.Y()+par2.Y()));
pm2.SetX(0.5*(par1.X()+par0.X())); pm2.SetY(0.5*(par1.Y()+par0.Y()));
(*testout) << pnt.X() << " " << pnt.Y() << " " << pnt.Z() << endl;
*/
}
-@@ -970,7 +972,7 @@
+@@ -970,7 +974,7 @@
if (mparam.uselocalh)
{
multithread.percent = 0;
mesh->SetLocalH (bb.PMin(), bb.PMax(), mparam.grading);
-@@ -1075,7 +1077,6 @@
+@@ -1075,7 +1079,6 @@
if (triangulation.IsNull()) continue;
BRepAdaptor_Surface sf(face, Standard_True);
int ntriangles = triangulation -> NbTriangles();
for (int j = 1; j <= ntriangles; j++)
-@@ -1096,7 +1097,7 @@
+@@ -1096,7 +1099,7 @@
maxside = max (maxside, p[1].Distance(p[2]));
//cout << "\rFace " << i << " pos11 ntriangles " << ntriangles << " maxside " << maxside << flush;
//cout << "\rFace " << i << " pos12 ntriangles " << ntriangles << flush;
}
}
-diff -Naur netgen-4.5.old/libsrc/occ/occgeom.cpp netgen-4.5.new/libsrc/occ/occgeom.cpp
---- netgen-4.5.old/libsrc/occ/occgeom.cpp 2006-01-25 16:35:50.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/occgeom.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occgeom.cpp netgen-4.5_new/libsrc/occ/occgeom.cpp
+--- netgen-4.5_orig/libsrc/occ/occgeom.cpp 2006-01-25 16:35:50.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/occgeom.cpp 2010-11-25 10:11:31.000000000 +0300
@@ -7,6 +7,8 @@
#include "ShapeAnalysis_ShapeContents.hxx"
#include "ShapeAnalysis_CheckSmallFace.hxx"
return true;
}
-diff -Naur netgen-4.5.old/libsrc/occ/occgeom.hpp netgen-4.5.new/libsrc/occ/occgeom.hpp
---- netgen-4.5.old/libsrc/occ/occgeom.hpp 2006-01-25 16:35:50.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/occgeom.hpp 2009-06-11 17:56:43.000000000 +0400
+@@ -1190,16 +1189,16 @@
+ return occgeo;
+ }
+
+- char * shapesname[] =
++ const char * shapesname[] =
+ {" ", "CompSolids", "Solids", "Shells",
+
+ "Faces", "Wires", "Edges", "Vertices"};
+
+- char * shapename[] =
++ const char * shapename[] =
+ {" ", "CompSolid", "Solid", "Shell",
+ "Face", "Wire", "Edge", "Vertex"};
+
+- char * orientationstring[] =
++ const char * orientationstring[] =
+ {"+", "-"};
+
+ void OCCGeometry :: RecursiveTopologyTree (const TopoDS_Shape & sh,
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occgeom.hpp netgen-4.5_new/libsrc/occ/occgeom.hpp
+--- netgen-4.5_orig/libsrc/occ/occgeom.hpp 2006-01-25 16:35:50.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/occgeom.hpp 2010-11-25 10:11:31.000000000 +0300
@@ -15,8 +15,6 @@
#include "Geom_Curve.hxx"
#include "Geom2d_Curve.hxx"
OCCSurface GetSurface (int surfi)
{
cout << "OCCGeometry::GetSurface using PLANESPACE" << endl;
-diff -Naur netgen-4.5.old/libsrc/occ/occmeshsurf.cpp netgen-4.5.new/libsrc/occ/occmeshsurf.cpp
---- netgen-4.5.old/libsrc/occ/occmeshsurf.cpp 2006-01-25 16:36:26.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/occmeshsurf.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occmeshsurf.cpp netgen-4.5_new/libsrc/occ/occmeshsurf.cpp
+--- netgen-4.5_orig/libsrc/occ/occmeshsurf.cpp 2006-01-25 16:36:26.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/occmeshsurf.cpp 2010-11-25 10:11:31.000000000 +0300
@@ -5,6 +5,8 @@
#include <occgeom.hpp>
#include <meshing.hpp>
-diff -Naur netgen-4.5.old/libsrc/occ/occmeshsurf.hpp netgen-4.5.new/libsrc/occ/occmeshsurf.hpp
---- netgen-4.5.old/libsrc/occ/occmeshsurf.hpp 2005-06-09 18:51:10.000000000 +0400
-+++ netgen-4.5.new/libsrc/occ/occmeshsurf.hpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/occmeshsurf.hpp netgen-4.5_new/libsrc/occ/occmeshsurf.hpp
+--- netgen-4.5_orig/libsrc/occ/occmeshsurf.hpp 2005-06-09 18:51:10.000000000 +0400
++++ netgen-4.5_new/libsrc/occ/occmeshsurf.hpp 2010-11-25 10:11:31.000000000 +0300
@@ -151,7 +151,7 @@
MeshOptimize2dOCCSurfaces (const OCCGeometry & ageometry);
};
-diff -Naur netgen-4.5.old/libsrc/occ/utilities.h netgen-4.5.new/libsrc/occ/utilities.h
---- netgen-4.5.old/libsrc/occ/utilities.h 2005-02-11 14:35:43.000000000 +0300
-+++ netgen-4.5.new/libsrc/occ/utilities.h 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/occ/utilities.h netgen-4.5_new/libsrc/occ/utilities.h
+--- netgen-4.5_orig/libsrc/occ/utilities.h 2005-02-11 14:35:43.000000000 +0300
++++ netgen-4.5_new/libsrc/occ/utilities.h 2010-11-25 10:11:31.000000000 +0300
@@ -33,6 +33,7 @@
#include <string>
#include <cstdlib>
// #include "SALOME_Log.hxx"
-diff -Naur netgen-4.5.old/libsrc/stlgeom/meshstlsurface.cpp netgen-4.5.new/libsrc/stlgeom/meshstlsurface.cpp
---- netgen-4.5.old/libsrc/stlgeom/meshstlsurface.cpp 2006-01-11 19:08:20.000000000 +0300
-+++ netgen-4.5.new/libsrc/stlgeom/meshstlsurface.cpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.cpp netgen-4.5_new/libsrc/stlgeom/meshstlsurface.cpp
+--- netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.cpp 2006-01-11 19:08:20.000000000 +0300
++++ netgen-4.5_new/libsrc/stlgeom/meshstlsurface.cpp 2010-11-25 10:11:31.000000000 +0300
@@ -946,20 +946,23 @@
}
void MeshOptimizeSTLSurface :: GetNormalVector(INDEX surfind, const Point3d & p, Vec3d & n) const
{
n = geom.GetChartNormalVector();
-diff -Naur netgen-4.5.old/libsrc/stlgeom/meshstlsurface.hpp netgen-4.5.new/libsrc/stlgeom/meshstlsurface.hpp
---- netgen-4.5.old/libsrc/stlgeom/meshstlsurface.hpp 2004-09-30 17:13:56.000000000 +0400
-+++ netgen-4.5.new/libsrc/stlgeom/meshstlsurface.hpp 2009-06-11 17:56:43.000000000 +0400
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.hpp netgen-4.5_new/libsrc/stlgeom/meshstlsurface.hpp
+--- netgen-4.5_orig/libsrc/stlgeom/meshstlsurface.hpp 2004-09-30 17:13:56.000000000 +0400
++++ netgen-4.5_new/libsrc/stlgeom/meshstlsurface.hpp 2010-11-25 10:11:31.000000000 +0300
@@ -79,12 +79,10 @@
virtual void SelectSurfaceOfPoint (const Point3d & p,
const PointGeomInfo & gi);
virtual void GetNormalVector(INDEX surfind, const Point3d & p, Vec3d & n) const;
};
-diff -Naur netgen-4.5.old/makeForSalome.sh netgen-4.5.new/makeForSalome.sh
---- netgen-4.5.old/makeForSalome.sh 1970-01-01 03:00:00.000000000 +0300
-+++ netgen-4.5.new/makeForSalome.sh 2009-06-11 17:56:43.000000000 +0400
-@@ -0,0 +1,31 @@
+diff -Naur --exclude=CVS netgen-4.5_orig/libsrc/stlgeom/stlgeommesh.cpp netgen-4.5_new/libsrc/stlgeom/stlgeommesh.cpp
+--- netgen-4.5_orig/libsrc/stlgeom/stlgeommesh.cpp 2004-08-10 03:39:45.000000000 +0400
++++ netgen-4.5_new/libsrc/stlgeom/stlgeommesh.cpp 2010-11-25 10:11:31.000000000 +0300
+@@ -1437,7 +1437,7 @@
+
+ if (!optstring || strlen(optstring) == 0)
+ {
+- mparam.optimize2d = "smcm";
++ mparam.optimize2d = (char*)"smcm";
+ }
+ else
+ {
+@@ -1453,7 +1453,7 @@
+ mparam.grading);
+ mesh -> LoadLocalMeshSize (mparam.meshsizefilename);
+ mesh -> CalcLocalHFromSurfaceCurvature (stlparam.resthsurfmeshcurvfac);
+- mparam.optimize2d = "cmsmSm";
++ mparam.optimize2d = (char*)"cmsmSm";
+ STLSurfaceOptimization (*stlgeometry, *mesh, mparam);
+ #ifdef STAT_STREAM
+ (*statout) << GetTime() << " & ";
+@@ -1559,7 +1559,7 @@
+
+ if (!optstring || strlen(optstring) == 0)
+ {
+- mparam.optimize3d = "cmdmstm";
++ mparam.optimize3d = (char*)"cmdmstm";
+ }
+ else
+ {
+diff -Naur --exclude=CVS netgen-4.5_orig/makeForSalome.sh netgen-4.5_new/makeForSalome.sh
+--- netgen-4.5_orig/makeForSalome.sh 1970-01-01 03:00:00.000000000 +0300
++++ netgen-4.5_new/makeForSalome.sh 2010-11-25 10:11:31.000000000 +0300
+@@ -0,0 +1,35 @@
+#! /bin/sh
+cp ngtcltk/ngnewdelete.* libsrc/interface/
+
-+if test `uname -m` == "x86_64" ; then
++if test `uname -m` = "x86_64" ; then
+ MACHINE=LINUX64
+else
+ MACHINE=LINUX
+fi
+
+cp libsrc/interface/nglib.h libsrc/general/*.hpp libsrc/csg/*.hpp libsrc/geom2d/*.hpp \
++ libsrc/gprim/*.hpp libsrc/linalg/*.hpp libsrc/meshing/*.hpp \
++ libsrc/occ/*.hpp libsrc/opti/*.hpp libsrc/include/mydefs.hpp \
++ libsrc/stlgeom/*.hpp libsrc/include/mystdlib.h \
++ install/include
