OCC: Open Cascade Connexion
-Version: 2.8 (12/2018)
-Author: Onera
-
- -
Preamble
- - This module provides routines to use Open CASCADE capabilities within - Cassiopee.- - The current available function is for importing IGES files. Only CAD surfaces will be imported: other entities are ignored. - - This module manipulates both supported data structures, arrays, and pyTrees (see Converter Module). -
-
-
- In this documentation, we note a or b an array,
- and A or B a list of arrays.
- - To use the array interface: -
- import OCC as O
-
-
- - - To use the pyTree interface: -
- import OCC.PyTree as O
-
- File / arrays or File / pyTree conversion
- - - C.convertIGESArrays: - read an IGES file and return a list of arrays: -
- A = C.convertIGESArrays(fileName, h=0., chordal_err=0., growth_ratio=0.)
-
-
- The file extension must be one of the regular extensions : .igs, .iges, .IGS or .IGES. Both ASCII and binary format are handled. - -
| - Option name - | -- Meaning - | -- Default value - |
| - h - | -- Specified absolute size of the mesh edges. - | -- 0. The algorithm will compute an appropriate value (one tenth of the edges length average over the model). - |
| - chordal_err - | -- Specified chordal error. - | -- 0. The algorithm uses in this case 2% of h value. - |
| - growth_ratio - | -- Specified growth_ratio. - | -- 0: constant mesh size, if > 1., specifies the growing ratio of mesh size from boundary to interior. - |
- - C.convertIGES2PyTree: - read a file to a pyTree: -
- A = C.convertIGES2PyTree('in.iges')
-
- Example of use: import an IGES file into a tree. - -
- Return to main userguide - - diff --git a/Cassiopee/OCC/doc/OCC.txt b/Cassiopee/OCC/doc/OCC.txt index 900bc6963..43e953369 100644 --- a/Cassiopee/OCC/doc/OCC.txt +++ b/Cassiopee/OCC/doc/OCC.txt @@ -1,56 +1,4 @@ ============================================================================== -OCC 3.7 [10/2023] -Require: C++ compiler, python > 2.7, KCore, Generator 3.7 -- read edges/draft +OCC +Require: C++ compiler, python > 2.7, KCore, Generator ============================================================================== -OCC 3.6 [03/2023] -Require: C++ compiler, python > 2.4, KCore, Generator 3.6 -============================================================================== -OCC 3.5 [07/2022] -Require: C++ compiler, python > 2.4, KCore, Generator 3.5 -============================================================================== -OCC 3.4 [07/2022] -Require: C++ compiler, python > 2.4, KCore, Generator 3.4 -============================================================================== -OCC 3.3 [10/2021] -Require: C++ compiler, python > 2.4, KCore, Generator 3.3 -============================================================================== -OCC 3.2 [02/2021] -Require: C++ compiler, python > 2.4, KCore, Generator 3.2 -============================================================================== -OCC 3.1 [06/2020] -Require: C++ compiler, python > 2.4, KCore, Generator 3.1 -- support for STEP format -- new meshing algorithm (algo=1) -============================================================================== -OCC 3.0 [12/2019] -Require: C++ compiler, python > 2.4, KCore, Generator 3.0 -=============================================================================== -OCC 2.9 [06/2019] -Require: C++ compiler, python > 2.4, KCore, Generator 2.9 -=============================================================================== -OCC 2.8 [12/2018] -Require: C++ compiler, python > 2.4, KCore, Generator 2.8 -=============================================================================== -OCC 2.7 [07/2018] -Require: C++ compiler, python > 2.4, KCore, Generator 2.7 -=============================================================================== -OCC 2.6 [03/2018] -Require: C++ compiler, python > 2.4, KCore, Generator 2.6 -=============================================================================== -OCC 2.5 [20/09/2017] -Require: C++ compiler, python > 2.4, KCore, Generator 2.5 -=============================================================================== -OCC 2.4 [29/03/2017] -Require: C++ compiler, python > 2.4, KCore, Generator 2.4 -=============================================================================== -OCC 2.3 [28/11/2016] -Require: C++ compiler, python > 2.4, KCore, Generator 2.3 -=============================================================================== -OCC 2.2 [29/06/2016] -Require: C++ compiler, python > 2.4, KCore, Generator 2.2 -=============================================================================== -OCC 2.1 [15/01/2016] -Require: C++ compiler, python > 2.4, KCore, Generator 2.1 -- First release -=============================================================================== diff --git a/Cassiopee/OCC/doc/install b/Cassiopee/OCC/doc/install index 55a103dc1..a41068168 100755 --- a/Cassiopee/OCC/doc/install +++ b/Cassiopee/OCC/doc/install @@ -53,12 +53,15 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex OCC >& /dev/null + pdflatex OCC + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Cassiopee/OCC/doc/source/conf.py b/Cassiopee/OCC/doc/source/conf.py index faa7a92bb..9fbc3a88f 100644 --- a/Cassiopee/OCC/doc/source/conf.py +++ b/Cassiopee/OCC/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Cassiopee/OCC/install b/Cassiopee/OCC/install index 280503599..d37293071 100755 --- a/Cassiopee/OCC/install +++ b/Cassiopee/OCC/install @@ -65,8 +65,11 @@ if [ $PRODMODE -le 1 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=OCC --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/Cassiopee/Post/doc/Post.txt b/Cassiopee/Post/doc/Post.txt index e4ee7bd42..1124da2f5 100644 --- a/Cassiopee/Post/doc/Post.txt +++ b/Cassiopee/Post/doc/Post.txt @@ -1,244 +1,7 @@ =============================================================================== -Post 3.7 [10/2023] -Requires: C++ compiler, f77 compiler, python > 2.7, numpy > 1.0, KCore 3.7 +Post +Requires: C++ compiler, f77 compiler, python > 2.7, numpy > 1.0, KCore Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.7 -Optional: extraction functions features require Generator, Transform 3.7 -=============================================================================== -Post 3.6 [03/2023] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.6 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.6 -Optional: extraction functions features require Generator, Transform 3.6 -=============================================================================== -Post 3.5 [12/2022] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.5 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.5 -Optional: extraction functions features require Generator, Transform 3.5 -=============================================================================== -Post 3.4 [07/2022] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.4 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.4 -Optional: extraction functions features require Generator, Transform 3.4 -- Rotor module -- ExtraVariable2 module -=============================================================================== -Post 3.3 [10/2021] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.3 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.3 -Optional: extraction functions features require Generator, Transform 3.3 -=============================================================================== -Post 3.2 [02/2021] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.2 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.2 -Optional: extraction functions features require Generator, Transform 3.2 -=============================================================================== -Post 3.1 [06/2020] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.1 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.1 -Optional: extraction functions features require Generator, Transform 3.1 -- streamLines2: optimized stream lines -=============================================================================== -Post 3.0 [12/2019] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.0 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 3.0 -Optional: extraction functions features require Generator, Transform 3.0 -=============================================================================== -Post 2.9 [06/2019] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.9 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.9 -Optional: extraction functions features require Generator, Transform 2.9 -=============================================================================== -Post 2.8 [12/2018] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.8 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.8 -Optional: extraction functions features require Generator, Transform 2.8 -- Post: computeDiv -- Post: computeDiv2 -=============================================================================== -Post 2.7 [07/2018] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.7 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.7 -Optional: extraction functions features require Generator, Transform 2.7 -- doc sphinx -- computDiv2: calcul direct de la divergence d'un champ -=============================================================================== -Post 2.6 [03/2018] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.6 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.6 -Optional: extraction functions features require Generator, Transform 2.6 -=============================================================================== -Post 2.5 [20/09/2017] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.5 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.5 -Optional: extraction functions features require Generator, Transform 2.5 -- Post : computeVariables work with primary variables -- Post : faster isoSurf and isoSurfMC -=============================================================================== -Post 2.4 [29/03/2017] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.4 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.4 -Optional: extraction functions features require Generator, Transform 2.4 -=============================================================================== -Post 2.3 [28/11/2016] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.3 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.3 -Optional: extraction functions features require Generator, Transform 2.3 -=============================================================================== -Post 2.3 [28/11/2016] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.3 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.3 -Optional: extraction functions features require Generator, Transform 2.3 -=============================================================================== -Post 2.2 [29/06/2016] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.2 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.2 -Optional: extraction functions features require Generator, Transform 2.2 -=============================================================================== -Post 2.1 [15/01/2016] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.1 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.1 -Optional: extraction functions features require Generator, Transform 2.1 -- Post : opt. exteriorElements+basic -=============================================================================== -Post 2.0 [26/06/2015] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.0 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 2.0 -Optional: extraction functions features require Generator, Transform 2.0 -=============================================================================== -Post R.4 [16/01/2015] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.4 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter R.4 -Optional: extraction functions features require Generator, Transform R.4 -- computeNormGrad, computeNormCurl -- renameVars -=============================================================================== -Post R.3 [12/05/2014] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.3 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter R.3 -Optional: extraction functions features require Generator, Transform R.3 -=============================================================================== -Post R.2 [15/11/2013] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.2 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter R.2 -Optional: extraction functions features require Generator, Transform R.2 -=============================================================================== -Post R.1 [22/05/2013] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.1 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter R.1 -Optional: extraction functions features require Generator, Transform R.1 -- exteriorElts + NGON -- extrapolation in extractMesh -- silhouette -- selectCells NGon -- hook pour extract point -=============================================================================== -Post 1.10 [07/11/2012] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.10 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.10 -Optional: extraction functions features require Generator, Transform 1.10 -- isoSurfMC generates QUAD dominant meshes. -- exteriorElts. -=============================================================================== -Post 1.9 [05/04/2012] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.9 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.9 -Optional: extraction functions features require Generator, Transform 1.9 -- selectCells+formula. -=============================================================================== -Post 1.8 [22/09/2011] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.8 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.8 -Optional: extraction functions features require Generator, Transform 1.8 -- computeExtraVariables : SkinFriction, skinFrictionTangential. -- iso surf by marching cubes. -- isoSurf returns a list of two zones by elt type [TRI, BAR]. -=============================================================================== -Post 1.7 [17/03/2011] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.7 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.7 -Optional: extraction functions features require Generator, Transform 1.7 -- optimisation exteriorFaces -=============================================================================== -Post 1.6 [27/10/2010] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.6 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.6 -Optional: extraction functions features require Generator, Transform 1.6 -- importVariables: import aussi les grilles supplementaires. -- isoSurf. -- frontFaces. -=============================================================================== -Post 1.5 [22/03/2010] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.5 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.5 -Optional: extraction functions features require Generator, Transform 1.5 -- mergeElts->coarsen. -- refine. -- selectCells2. -- strict option in selectCells. -=============================================================================== -Post 1.4 [24/09/2009] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.4 -Optional: usurp function requires f90 compiler -Optional: PyTree interface requires Converter 1.4 -Optional: extraction functions features require Generator, Transform 1.4 -- reorderAll passe dans Transform -=============================================================================== -Post 1.3 [19/05/2009] -Requires: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.3 -Optional: PyTree interface requires Converter 1.3 -Optional: extraction functions features require Generator 1.3, Transform 1.3 -Optional: usurp function requires f90 compiler -- mergeElts -- Post : modification de l'interface de computeGrad et computeCurl -- portage Linux/Ubuntu -=============================================================================== -Post 1.2 [27/11/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.2 -Optional: f90 compiler -- extractPoint, extractMesh for unstructured meshes -- streamLines, streamRibbons for unstructured meshes -- extractPlane for unstructured meshes -- exteriorFaces -=============================================================================== -Post 1.1 [24/06/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.1 -Optional: f90 compiler -- computeCurl, computeGrad. -- extractPoint, extractMesh, extractPlane from surface meshes. -- node2Center and center2Node for an array, any more for an array list. -- streams. -- select cells in solution. -=============================================================================== -Post 1.0 [03/04/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.0 -Optional: f90 compiler -- First release +Optional: PyTree interface requires Converter +Optional: extraction functions features require Generator, Transform =============================================================================== diff --git a/Cassiopee/Post/doc/install b/Cassiopee/Post/doc/install index 61c26d7b1..6fc4a29cb 100755 --- a/Cassiopee/Post/doc/install +++ b/Cassiopee/Post/doc/install @@ -53,15 +53,21 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex Post >& /dev/null - pdflatex Rotor >& /dev/null - pdflatex ExtraVariables2 >& /dev/null - pdflatex Post_IBM >& /dev/null + pdflatex Post + [ $? != 0 ] && exit 1; + pdflatex Rotor + [ $? != 0 ] && exit 1; + pdflatex ExtraVariables2 + [ $? != 0 ] && exit 1; + pdflatex Post_IBM + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Cassiopee/Post/doc/source/ExtraVariables2.rst b/Cassiopee/Post/doc/source/ExtraVariables2.rst index bff092268..a6047dc8b 100644 --- a/Cassiopee/Post/doc/source/ExtraVariables2.rst +++ b/Cassiopee/Post/doc/source/ExtraVariables2.rst @@ -4,7 +4,7 @@ Post.ExtraVariables2: derived fields from primitive variables -========================================================= +============================================================== This module compute derived fields from primitive variables. diff --git a/Cassiopee/Post/doc/source/Rotor.rst b/Cassiopee/Post/doc/source/Rotor.rst index c427622bf..b9c3e0bcc 100644 --- a/Cassiopee/Post/doc/source/Rotor.rst +++ b/Cassiopee/Post/doc/source/Rotor.rst @@ -4,7 +4,7 @@ Post.Rotor: rotor specific post-processing -====================================== +========================================== Specific post-processing for rotors or propellers. diff --git a/Cassiopee/Post/doc/source/conf.py b/Cassiopee/Post/doc/source/conf.py index da7a5b918..9611200b8 100644 --- a/Cassiopee/Post/doc/source/conf.py +++ b/Cassiopee/Post/doc/source/conf.py @@ -173,7 +173,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Cassiopee/Post/install b/Cassiopee/Post/install index 67d3a721f..ba23285eb 100755 --- a/Cassiopee/Post/install +++ b/Cassiopee/Post/install @@ -63,8 +63,11 @@ if [ $PRODMODE -le 1 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=Post --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/Cassiopee/RigidMotion/doc/RigidMotion.txt b/Cassiopee/RigidMotion/doc/RigidMotion.txt index 8064249fb..204d91d29 100644 --- a/Cassiopee/RigidMotion/doc/RigidMotion.txt +++ b/Cassiopee/RigidMotion/doc/RigidMotion.txt @@ -1,76 +1,4 @@ =============================================================================== -RigidMotion 3.7 [10/2023] -Require: C++ compiler, python > 2.7, numpy > 1.0, KCore, Converter 3.7 -=============================================================================== -RigidMotion 3.6 [03/2023] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.6 -=============================================================================== -RigidMotion 3.5 [12/2022] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.5 -=============================================================================== -RigidMotion 3.4 [07/2022] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.4 -=============================================================================== -RigidMotion 3.3 [10/2021] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.3 -=============================================================================== -RigidMotion 3.2 [02/2021] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.2 -=============================================================================== -RigidMotion 3.1 [06/2020] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.1 -=============================================================================== -RigidMotion 3.0 [12/2019] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 3.0 -=============================================================================== -RigidMotion 2.9 [06/2019] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.9 -=============================================================================== -RigidMotion 2.8 [12/2018] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.8 -=============================================================================== -RigidMotion 2.7 [07/2018] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.7 -- doc sphinx -=============================================================================== -RigidMotion 2.6 [03/2018] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.6 -=============================================================================== -RigidMotion 2.5 [20/09/2017] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.5 -=============================================================================== -RigidMotion 2.4 [29/03/2017] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.4 -=============================================================================== -RigidMotion 2.3 [28/11/2016] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.3 -=============================================================================== -RigidMotion 2.2 [29/06/2016] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.2 -=============================================================================== -RigidMotion 2.1 [15/01/2016] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.1 -=============================================================================== -RigidMotion 2.0 [26/06/2015] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 2.0 -=============================================================================== -RigidMotion R.4 [16/01/2015] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter R.4 -=============================================================================== -RigidMotion R.3 [12/05/2014] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter R.3 -=============================================================================== -RigidMotion R.2 [15/11/2013] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter R.2 -=============================================================================== -RigidMotion R.1 [22/05/2013] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter R.1 -=============================================================================== -RigidMotion 1.10 [07/11/2012] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 1.10 -- evalPosition (from Transform.move). -=============================================================================== -RigidMotion 1.9 [05/04/2012] -Require: C++ compiler, python > 2.4, numpy > 1.0, KCore, Converter 1.9 -- First release +RigidMotion +Require: C++ compiler, python > 2.7, numpy > 1.0, KCore, Converter =============================================================================== diff --git a/Cassiopee/RigidMotion/doc/install b/Cassiopee/RigidMotion/doc/install index e55412689..466f12164 100755 --- a/Cassiopee/RigidMotion/doc/install +++ b/Cassiopee/RigidMotion/doc/install @@ -52,12 +52,15 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex RigidMotion >& /dev/null + pdflatex RigidMotion + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Cassiopee/RigidMotion/doc/source/conf.py b/Cassiopee/RigidMotion/doc/source/conf.py index 3b1231ebb..c150605a9 100644 --- a/Cassiopee/RigidMotion/doc/source/conf.py +++ b/Cassiopee/RigidMotion/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Cassiopee/RigidMotion/install b/Cassiopee/RigidMotion/install index 11a0cad71..813fdceab 100755 --- a/Cassiopee/RigidMotion/install +++ b/Cassiopee/RigidMotion/install @@ -59,8 +59,11 @@ if [ $PRODMODE -le 1 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=RigidMotion --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/Cassiopee/Template/install b/Cassiopee/Template/install index b01091996..24145bcfd 100755 --- a/Cassiopee/Template/install +++ b/Cassiopee/Template/install @@ -59,8 +59,11 @@ if [ $PRODMODE -le 0 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=Template --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/Cassiopee/Transform/doc/Transform.txt b/Cassiopee/Transform/doc/Transform.txt index 834a06471..00a46f2ee 100644 --- a/Cassiopee/Transform/doc/Transform.txt +++ b/Cassiopee/Transform/doc/Transform.txt @@ -1,206 +1,6 @@ =============================================================================== -Transform 3.7 [10/2023] -Require: C++ compiler, f77 compiler, python > 2.7, numpy > 1.0, KCore 3.7 -Optional: pyTree interface requires Converter 3.7 -Optional: splitMultiplePts function requires Connector 3.7 -=============================================================================== -Transform 3.6 [03/2023] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.6 -Optional: pyTree interface requires Converter 3.6 -Optional: splitMultiplePts function requires Connector 3.6 -=============================================================================== -Transform 3.5 [12/2022] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.5 -Optional: pyTree interface requires Converter 3.5 -Optional: splitMultiplePts function requires Connector 3.5 -=============================================================================== -Transform 3.4 [07/2022] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.4 -Optional: pyTree interface requires Converter 3.4 -Optional: splitMultiplePts function requires Connector 3.4 -- splitFullMatch : split to have full face match -=============================================================================== -Transform 3.3 [10/2021] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.3 -Optional: pyTree interface requires Converter 3.3 -Optional: splitMultiplePts function requires Connector 3.3 -=============================================================================== -Transform 3.2 [02/2021] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.2 -Optional: pyTree interface requires Converter 3.2 -Optional: splitMultiplePts function requires Connector 3.2 -=============================================================================== -Transform 3.1 [06/2020] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.1 -Optional: pyTree interface requires Converter 3.1 -Optional: splitMultiplePts function requires Connector 3.1 -=============================================================================== -Transform 3.0 [12/2019] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 3.0 -Optional: pyTree interface requires Converter 3.0 -Optional: splitMultiplePts function requires Connector 3.0 -- Transform: splitSize in place+no need for connectMatch for structured grids -- Transform: splitNParts in place+no need for connectMatch for structured grids -=============================================================================== -Transform 2.9 [06/2019] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.9 -Optional: pyTree interface requires Converter 2.9 -Optional: splitMultiplePts function requires Connector 2.9 -=============================================================================== -Transform 2.8 [12/2018] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.8 -Optional: pyTree interface requires Converter 2.8 -Optional: splitMultiplePts function requires Connector 2.8 -- Transform: amelioration de la doc -=============================================================================== -Transform 2.7 [07/2018] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.7 -Optional: pyTree interface requires Converter 2.7 -Optional: splitMultiplePts function requires Connector 2.7 -=============================================================================== -Transform 2.6 [03/2018] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.6 -Optional: pyTree interface requires Converter 2.6 -Optional: splitMultiplePts function requires Connector 2.6 -=============================================================================== -Transform 2.5 [20/09/2017] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.5 -Optional: pyTree interface requires Converter 2.5 -Optional: splitMultiplePts function requires Connector 2.5 -- Transform : cart2Cyl -=============================================================================== -Transform 2.4 [29/11/2017] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.4 -Optional: pyTree interface requires Converter 2.4 -Optional: splitMultiplePts function requires Connector 2.4 -=============================================================================== -Transform 2.3 [28/11/2016] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.3 -Optional: pyTree interface requires Converter 2.3 -Optional: splitMultiplePts function requires Connector 2.3 -- scale -=============================================================================== -Transform 2.2 [29/06/2016] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.2 -Optional: pyTree interface requires Converter 2.2 -Optional: splitMultiplePts function requires Connector 2.2 -- splitManifold -- reorderAll for TRI -=============================================================================== -Transform 2.1 [15/01/2016] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.1 -Optional: pyTree interface requires Converter 2.1 -Optional: splitMultiplePts function requires Connector 2.1 -- Transform : projectOrthoSmooth -=============================================================================== -Transform 2.0 [26/06/2015] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 2.0 -Optional: pyTree interface requires Converter 2.0 -Optional: splitMultiplePts function requires Connector 2.0 -=============================================================================== -Transform R.4 [16/01/2015] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.4 -Optional: pyTree interface requires Converter R.4 -Optional: splitMultiplePts function requires Connector R.4 -- subzone with negative indices -=============================================================================== -Transform R.3 [12/05/2014] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.3 -Optional: pyTree interface requires Converter R.3 -Optional: splitMultiplePts function requires Connector R.3 -- splitNParts -- splitSize + ressource -- splitSize no longer perform connectMatch -=============================================================================== -Transform R.2 [15/11/2013] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.2 -Optional: pyTree interface requires Converter R.2 -Optional: splitMultiplePts function requires Connector R.2 -- reorder NGon -- addkplane NGon -=============================================================================== -Transform R.1 [22/05/2013] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore R.1 -Optional: pyTree interface requires Converter R.1 -Optional: splitMultiplePts function requires Connector R.1 -- split connexity NGon -- spliSharpEdges NGon -- smooth NGon -- patch + node list -=============================================================================== -Transform 1.10 [07/11/2012] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.10 -Optional: pyTree interface requires Converter 1.10 -Optional: splitMultiplePts function requires Connector 1.10 -- reorder for TRI/QUAD mixed meshes. -- reorder + toptree option. -- join+centers. -- deformNormals. -- merge+centers. -- optimisation join. -- breakElements. -=============================================================================== -Transform 1.9 [05/04/2012] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.9 -Optional: pyTree interface requires Converter 1.9 -Optional: splitMultiplePts function requires Connector 1.9 -- deform mesh. -=============================================================================== -Transform 1.8 [22/09/2011] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.8 -Optional: pyTree interface requires Converter 1.8 -Optional: splitMultiplePts function requires Connector 1.8 -- merge de maillages structures. -- splitTBranches. -=============================================================================== -Transform 1.7 [17/03/2011] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.7 -Optional: pyTree interface requires Converter 1.7 -Optional: splitMultiplePts function requires Connector 1.7 -- splitSharpEdges -=============================================================================== -Transform 1.6 [27/10/2010] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.6 -Optional: pyTree interface requires Converter 1.6 -Optional: splitMultiplePts function requires Connector 1.6 -- splitSize respects multigrid. -=============================================================================== -Transform 1.5 [22/03/2010] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.5 -Optional: pyTree interface requires Converter 1.5 -Optional: splitMultiplePts function requires Connector 1.5 -- projectDir (smooth). -=============================================================================== -Transform 1.4 [24/09/2009] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.4 -Optional: pyTree interface requires Converter 1.4 -Optional: splitMultiplePts function requires Connector 1.4 -- projection de maillages surfaciques -- projectOrtho -- projectRay -- prise en compte des CL dans oneovern, addkplane, reorder -- split, splitSpline passe dans Transform -- splitConnexity -- splitMultiplePts -- reorder pour les array TRI et QUAD -=============================================================================== -Transform 1.3 [19/05/2009] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.3 -Optional: join feature requires Converter 1.3 -Optional: pyTree interface requires Converter 1.3 -- join a list of arrays -- modification de l'interface de deform -- portage Linux/Ubuntu -=============================================================================== -Transform 1.2 [27/11/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.2 -- addkplane for unstructured meshes -=============================================================================== -Transform 1.1 [24/06/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.1 -- work on arrays or work on array list. -=============================================================================== -Transform 1.0 [03/04/2008] -Require: C++ compiler, f77 compiler, python > 2.4, numpy > 1.0, KCore 1.0 -- First release +Transform +Require: C++ compiler, f77 compiler, python > 2.7, numpy > 1.0, KCore +Optional: pyTree interface requires Converter +Optional: splitMultiplePts function requires Connector =============================================================================== diff --git a/Cassiopee/Transform/doc/install b/Cassiopee/Transform/doc/install index 33595037b..a4af95d06 100755 --- a/Cassiopee/Transform/doc/install +++ b/Cassiopee/Transform/doc/install @@ -53,12 +53,15 @@ cd .. # Build html touch source/*.rst sphinx-build -b html ./source ./build +[ $? != 0 ] && exit 1; if ([ $PRODUCTION -eq 1 ]) then # Build pdf sphinx-build -b latex ./source ./build + [ $? != 0 ] && exit 1; cd build - pdflatex Transform >& /dev/null + pdflatex Transform + [ $? != 0 ] && exit 1; cd .. fi diff --git a/Cassiopee/Transform/doc/source/conf.py b/Cassiopee/Transform/doc/source/conf.py index 26f7b35fa..81a0d4c3f 100644 --- a/Cassiopee/Transform/doc/source/conf.py +++ b/Cassiopee/Transform/doc/source/conf.py @@ -172,7 +172,7 @@ html_show_sphinx = False # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -html_show_copyright = True +html_show_copyright = False # If true, an OpenSearch description file will be output, and all pages will # contain a tag referring to it. The value of this option must be the diff --git a/Cassiopee/Transform/install b/Cassiopee/Transform/install index 0c68e79e3..315907da3 100755 --- a/Cassiopee/Transform/install +++ b/Cassiopee/Transform/install @@ -61,8 +61,11 @@ if [ $PRODMODE -le 1 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=Transform --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/Cassiopee/XCore/XCore/chunk2partElt.cpp b/Cassiopee/XCore/XCore/chunk2partElt.cpp index c3ba500c0..26073c73c 100644 --- a/Cassiopee/XCore/XCore/chunk2partElt.cpp +++ b/Cassiopee/XCore/XCore/chunk2partElt.cpp @@ -61,11 +61,11 @@ struct Poly { : stride(s) {} - void set(E_Int *p) + void set(E_Int *p) { - std::sort(p, p+stride); for (E_Int i = 0; i < stride; i++) n[i] = p[i]; + std::sort(n, n+stride); } bool operator==(const Poly &P) const diff --git a/Cassiopee/XCore/install b/Cassiopee/XCore/install index 487ffa6b5..5dcbf38fd 100755 --- a/Cassiopee/XCore/install +++ b/Cassiopee/XCore/install @@ -67,8 +67,11 @@ if [ $PRODMODE -le 1 ]; then python setup.py install --prefix="$INSTALLPATH" [ $? != 0 ] && exit 1; elif [ $PRODMODE -eq 1 ]; then - python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + python -m pip install --no-cache-dir --no-binary=XCore --ignore-installed --upgrade --prefix="$INSTALLPATH" . [ $? != 0 ] && exit 1; + elif [ $PRODMODE -eq 2 ]; then + python -m pip install --ignore-installed --upgrade --prefix="$INSTALLPATH" . + [ $? != 0 ] && exit 1; fi else python setupLegacy.py install --prefix="$INSTALLPATH" diff --git a/README.md b/README.md index e0ac648a7..1da181dc9 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,20 @@ # Cassiopee 4 +**C**omputational **F**luid **D**ynamics pre- and post-processing python modules. + -- Under construction -- +- [Documentation](https://onera.github.io/Cassiopee) + +- Tutorials + +## Installation from binaries + + + + ## Installation from sources -On windows: [see install page](https://github.com/onera/Cassiopee/blob/main/docs/developers/Install/msys2.md) +- [On windows](https://github.com/onera/Cassiopee/blob/main/docs/developers/Install/msys2.md) -On linux ubuntu: [see install page.](https://github.com/onera/Cassiopee/blob/main/docs/developers/Install/ubuntu.md) \ No newline at end of file +- [On linux ubuntu](https://github.com/onera/Cassiopee/blob/main/docs/developers/Install/ubuntu.md) \ No newline at end of file diff --git a/docs/More.html b/docs/More.html index 3e1fa49df..e2a4a8698 100644 --- a/docs/More.html +++ b/docs/More.html @@ -22,7 +22,7 @@
A set of Python modules for CFD pre- and post-processing
-Cassiopée (CFD Advanced Set of Services In an Open Python EnvironmEnt) is a set of Python modules providing advanced services for preparing CFD computations and post-processing CFD solutions. This is a research software developped by ONERA, the French Aerospace Lab and distributed as free software under GPL3. Cassiopée is independent of any solver and can be used with any multiblock/overset structured/unstructured flow solver.
+
Cassiopée (CFD Advanced Set of Services In an Open Python EnvironmEnt) is a set of Python modules providing advanced services for preparing CFD computations and post-processing CFD solutions. This is a research software developped by ONERA, the French Aerospace Lab and distributed as free software under LGPL3. Cassiopée is independent of any solver and can be used with any multiblock/overset structured/unstructured flow solver.
Provided services are low level functions, that are designed to be used for easily building your own applications.
diff --git a/docs/News.html b/docs/ReleaseNotes.html
similarity index 99%
rename from docs/News.html
rename to docs/ReleaseNotes.html
index aea3731ee..50d381532 100644
--- a/docs/News.html
+++ b/docs/ReleaseNotes.html
@@ -19,7 +19,9 @@
Author : ONERA
- All: release 4.0 (XX/2024) - in construction
-- Converter: extractBCOfType change zone name separator from "/" to "\"
+- Converter: extractBCOfType change zone name separator from "/" to "\"
+
+- CPlot: display solidStyle defaulting to 0.
- All: release 3.7 (10/2023)
diff --git a/docs/doc/CPlot.html b/docs/doc/CPlot.html
index 032e4f0eb..1d238b5f3 100644
--- a/docs/doc/CPlot.html
+++ b/docs/doc/CPlot.html
@@ -61,22 +61,22 @@
List of functions
– Actions
|
+|
|
Display arrays. |
| + | |
Force render. |
|
|
+|
|
Delete zones from plotter. |
|
+|
|
Add one zone to plotter. |
|
+|
|
Replace arrays[no] by array. |
|
+|
|
Finalize export. |
|
+|
|
Return a state in plotter. |
| + | |
Return the selected zone in plotter. |
|
| + | |
Return the selected zones in plotter. |
|
|
+|
|
Return the selected status of a zone in plotter. |
| + | |
Return the active (displayed) zones in plotter. |
|
|
+|
|
Return the active status of a zone in plotter. |
| + | |
Return the active (clicked) point in plotter. |
|
| + | |
Return the active (clicked) point index. |
|
| + | |
Return mouse state (mouse position and button state). |
|
| + | |
Return the pressed keys. |
|
| + | |
Reset the keyboard string. |
|
| + | |
Change displayed variable. |
|
| + | |
Change CPlot display style. |
|
| + | |
Change the blanking procedure. |
|
|
+|
|
Set CPlot state. |
|
+|
|
Set CPlot display mode. |
|
+|
|
Set selected zones. |
| + | |
Unselect all zones. |
| + | |
Look for selected zones. |
|
|
+|
|
Move posCam and posEye following check points. |
|
+|
|
Travel camera left. |
|
+|
|
Add a renderInfo node to a zone node. |
|
+|
|
Add a renderInfo node to a tree. |
|
+|
|
Load a view stored in slot. |