[calculix-cgx] 01/11: Imported Upstream version 2.11+dfsg
Wolfgang Fütterer
debian at wlf-online.de
Tue Aug 9 13:20:09 UTC 2016
This is an automated email from the git hooks/post-receive script.
wlfuetter-guest pushed a commit to branch master
in repository calculix-cgx.
commit b5c99a370f7a383adb52be1cb556fbf05c2bccf0
Author: Wolfgang Fütterer <debian at wlf-online.de>
Date: Tue Aug 9 10:21:26 2016 +0200
Imported Upstream version 2.11+dfsg
---
cgx_2.10/examples/airfoil/ISAAC/isaac.fbd | 0
cgx_2.10/examples/airfoil/ccx/send.fbl | 26 ---
cgx_2.10/examples/airfoil/ccx/send_penta.fbl | 19 --
cgx_2.10/examples/airfoil/ccx/send_penta.fbl~ | 18 --
{cgx_2.10 => cgx_2.11}/CHANGES | 19 ++
{cgx_2.10 => cgx_2.11}/COPYING | 0
{cgx_2.10 => cgx_2.11}/INSTALL | 43 ++--
{cgx_2.10 => cgx_2.11}/README | 0
{cgx_2.10 => cgx_2.11}/examples/README | 0
.../examples/airfoil/ISAAC/RAE2822.hdr | 0
.../examples/airfoil/ISAAC/README | 0
.../examples/airfoil/ISAAC/isaac.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/airfoil/ccx/README | 13 +-
cgx_2.11/examples/airfoil/ccx/clean | 1 +
.../examples/airfoil/ccx/rae2822.inp | 43 ++--
.../examples/airfoil/ccx/rae2822_penta.fbd | 219 ++-------------------
.../examples/airfoil/ccx/rae2822_penta.inp | 44 +++--
cgx_2.11/examples/airfoil/ccx/rae2822_tetra.inp | 54 +++++
cgx_2.11/examples/airfoil/ccx/send.fbl | 43 ++++
cgx_2.11/examples/airfoil/ccx/send_penta.fbl | 36 ++++
cgx_2.11/examples/airfoil/ccx/send_tetra.fbl | 48 +++++
.../examples/airfoil/rae2822.fbb | 0
.../examples/airfoil/rae2822.fbd | 19 +-
{cgx_2.10 => cgx_2.11}/examples/basic/cylinder.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/basic/disc.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/basic/sphere.fbd | 0
.../examples/basic/sphere_seg.fbd | 0
.../examples/basic/sphere_vol.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/cad/README | 0
{cgx_2.10 => cgx_2.11}/examples/cad/halter.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/cad/halter.vda | 0
{cgx_2.10 => cgx_2.11}/examples/clean | 0
{cgx_2.10 => cgx_2.11}/examples/compressor/README | 0
.../examples/compressor/lavff.fbd | 0
.../examples/compressor/lavffcyc.inp | 0
.../examples/compressor/send.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/dolfyn/README | 0
{cgx_2.10 => cgx_2.11}/examples/dolfyn/cgx.patch | 0
.../examples/dolfyn/mirror/clean.sh | 0
.../examples/dolfyn/mirror/dolfyn.cfg | 0
.../examples/dolfyn/mirror/rename.sh | 0
.../examples/dolfyn/mirror/spiegel.din | 0
.../examples/dolfyn/mirror/spiegel.fbd | 0
.../examples/dolfyn/mirror/spiegel.inp | 0
{cgx_2.10 => cgx_2.11}/examples/geometry.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/glue/README | 0
{cgx_2.10 => cgx_2.11}/examples/glue/latjm.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/glue/latjm.inp | 0
{cgx_2.10 => cgx_2.11}/examples/glue/send.fbl | 0
.../examples/ifwhiledemo/all.fbd | 0
.../examples/ifwhiledemo/ifwhiledemo.fbl | 0
.../examples/ifwhiledemo/writedemo.txt | 0
{cgx_2.10 => cgx_2.11}/examples/map/README | 0
{cgx_2.10 => cgx_2.11}/examples/map/map2D.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/map/map3D.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/map/pressure.bak | 0
{cgx_2.10 => cgx_2.11}/examples/pressfit/README | 0
.../examples/pressfit/flange.fbd | 0
.../examples/pressfit/flange.inp | 0
.../examples/pressfit/hcpy_1.png | Bin
{cgx_2.10 => cgx_2.11}/examples/pressfit/send.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/result.frd | 0
.../examples/swepElements/README | 0
.../examples/swepElements/ring1.fbd | 0
.../examples/swepElements/ring1.fbl | 0
.../examples/swepElements/ring1.inp | 0
{cgx_2.10 => cgx_2.11}/examples/therm/README | 0
.../examples/therm/latimtrans.inp | 0
{cgx_2.10 => cgx_2.11}/examples/therm/post.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/therm/send.fbl | 0
{cgx_2.10 => cgx_2.11}/examples/turbine/README | 0
{cgx_2.10 => cgx_2.11}/examples/turbine/latim.fbd | 0
{cgx_2.10 => cgx_2.11}/examples/turbine/latim.inp | 0
{cgx_2.10 => cgx_2.11}/examples/turbine/send.fbl | 0
{cgx_2.10 => cgx_2.11}/netgen/README | 0
{cgx_2.10 => cgx_2.11}/netgen/ng_vol.cpp | 0
{cgx_2.10 => cgx_2.11}/netgen/ng_vol.cpp_orig | 0
{cgx_2.10 => cgx_2.11}/src/AsplitA.c | 0
{cgx_2.10 => cgx_2.11}/src/AsplitL.c | 0
{cgx_2.10 => cgx_2.11}/src/Makefile | 0
{cgx_2.10 => cgx_2.11}/src/Makefile.inc | 0
{cgx_2.10 => cgx_2.11}/src/XFunktions.c | 0
{cgx_2.10 => cgx_2.11}/src/adjustMidsideNode.c | 0
{cgx_2.10 => cgx_2.11}/src/badelems.c | 0
{cgx_2.10 => cgx_2.11}/src/bodyMesh2.c | 0
{cgx_2.10 => cgx_2.11}/src/bsort.c | 0
{cgx_2.10 => cgx_2.11}/src/bsortf.c | 0
{cgx_2.10 => cgx_2.11}/src/bsorti.c | 0
{cgx_2.10 => cgx_2.11}/src/calcNormalen.c | 0
{cgx_2.10 => cgx_2.11}/src/calcPrinc.c | 0
{cgx_2.10 => cgx_2.11}/src/calcPvector.c | 0
{cgx_2.10 => cgx_2.11}/src/calcWeight.c | 0
{cgx_2.10 => cgx_2.11}/src/cgx.c | 30 +--
{cgx_2.10 => cgx_2.11}/src/cgx.h | 18 +-
{cgx_2.10 => cgx_2.11}/src/checkIfNumber.c | 0
{cgx_2.10 => cgx_2.11}/src/compare.c | 0
{cgx_2.10 => cgx_2.11}/src/compareStrings.c | 0
{cgx_2.10 => cgx_2.11}/src/contact.c | 0
{cgx_2.10 => cgx_2.11}/src/copyEntity.c | 8 +-
{cgx_2.10 => cgx_2.11}/src/corrad.c | 0
{cgx_2.10 => cgx_2.11}/src/dataGeo.c | 0
{cgx_2.10 => cgx_2.11}/src/dataMesh.c | 19 +-
{cgx_2.10 => cgx_2.11}/src/defineEntity.c | 24 ++-
{cgx_2.10 => cgx_2.11}/src/dispLists.c | 0
{cgx_2.10 => cgx_2.11}/src/elemChecker.c | 0
{cgx_2.10 => cgx_2.11}/src/extFunktions.c | 9 +-
{cgx_2.10 => cgx_2.11}/src/extGL.c | 0
{cgx_2.10 => cgx_2.11}/src/extUtil.h | 0
{cgx_2.10 => cgx_2.11}/src/fillBody2.c | 0
{cgx_2.10 => cgx_2.11}/src/foamFaces.c | 0
{cgx_2.10 => cgx_2.11}/src/frecord.c | 0
{cgx_2.10 => cgx_2.11}/src/fuss.c | 0
{cgx_2.10 => cgx_2.11}/src/generateTet.cpp | 0
{cgx_2.10 => cgx_2.11}/src/getGeoDataTria.c | 0
{cgx_2.10 => cgx_2.11}/src/gl3grades.c | 0
{cgx_2.10 => cgx_2.11}/src/graph.c | 0
{cgx_2.10 => cgx_2.11}/src/ifind.c | 8 +-
{cgx_2.10 => cgx_2.11}/src/iinsert.c | 0
{cgx_2.10 => cgx_2.11}/src/improveBadTr3.c | 0
{cgx_2.10 => cgx_2.11}/src/improveMesh.c | 0
{cgx_2.10 => cgx_2.11}/src/iniMeshData.c | 3 +
{cgx_2.10 => cgx_2.11}/src/intpol.c | 0
{cgx_2.10 => cgx_2.11}/src/intpol2.c | 0
{cgx_2.10 => cgx_2.11}/src/intpol3.c | 0
{cgx_2.10 => cgx_2.11}/src/iremove.c | 0
{cgx_2.10 => cgx_2.11}/src/linelength.c | 0
{cgx_2.10 => cgx_2.11}/src/m_copy.c | 0
{cgx_2.10 => cgx_2.11}/src/m_prod.c | 0
{cgx_2.10 => cgx_2.11}/src/m_prodtr.c | 0
{cgx_2.10 => cgx_2.11}/src/m_sub.c | 0
{cgx_2.10 => cgx_2.11}/src/makeTriFromElems.c | 0
{cgx_2.10 => cgx_2.11}/src/mergEntity.c | 0
{cgx_2.10 => cgx_2.11}/src/mesh2d.c | 0
{cgx_2.10 => cgx_2.11}/src/meshSet.c | 0
{cgx_2.10 => cgx_2.11}/src/meshSurf.c | 0
{cgx_2.10 => cgx_2.11}/src/messages.c | 0
{cgx_2.10 => cgx_2.11}/src/near3d.c | 0
{cgx_2.10 => cgx_2.11}/src/nurbl2seq.c | 0
{cgx_2.10 => cgx_2.11}/src/orient.c | 0
{cgx_2.10 => cgx_2.11}/src/p_angle.c | 0
{cgx_2.10 => cgx_2.11}/src/parser.c | 0
{cgx_2.10 => cgx_2.11}/src/pickFunktions.c | 8 +-
{cgx_2.10 => cgx_2.11}/src/plotFunktions.c | 0
{cgx_2.10 => cgx_2.11}/src/readDuns.c | 0
{cgx_2.10 => cgx_2.11}/src/readEdges.c | 0
{cgx_2.10 => cgx_2.11}/src/readFoam.c | 0
{cgx_2.10 => cgx_2.11}/src/readIsaac.c | 0
{cgx_2.10 => cgx_2.11}/src/readNG.c | 0
{cgx_2.10 => cgx_2.11}/src/readNastran.c | 0
{cgx_2.10 => cgx_2.11}/src/readStdCmap.c | 0
{cgx_2.10 => cgx_2.11}/src/readStl.c | 0
{cgx_2.10 => cgx_2.11}/src/readWf.c | 0
{cgx_2.10 => cgx_2.11}/src/readccx.c | 7 +-
{cgx_2.10 => cgx_2.11}/src/readfrd.c | 0
{cgx_2.10 => cgx_2.11}/src/readstep.c | 0
{cgx_2.10 => cgx_2.11}/src/rectcyl.c | 0
{cgx_2.10 => cgx_2.11}/src/renumberfrd.c | 13 +-
{cgx_2.10 => cgx_2.11}/src/selectDisplayFaces.c | 0
{cgx_2.10 => cgx_2.11}/src/sendMpc.c | 0
{cgx_2.10 => cgx_2.11}/src/sendSet.c | 108 +++++-----
{cgx_2.10 => cgx_2.11}/src/setFunktions.c | 135 +++++++++++--
{cgx_2.10 => cgx_2.11}/src/shapeFunctions.c | 0
{cgx_2.10 => cgx_2.11}/src/sins.c | 0
{cgx_2.10 => cgx_2.11}/src/spline.c | 0
{cgx_2.10 => cgx_2.11}/src/splitElementsToTets.c | 0
{cgx_2.10 => cgx_2.11}/src/stof.c | 0
{cgx_2.10 => cgx_2.11}/src/stoi.c | 0
{cgx_2.10 => cgx_2.11}/src/stopClock.c | 0
{cgx_2.10 => cgx_2.11}/src/stos.c | 0
{cgx_2.10 => cgx_2.11}/src/strfind.c | 0
{cgx_2.10 => cgx_2.11}/src/strsplt.c | 0
{cgx_2.10 => cgx_2.11}/src/surfMesh2.c | 0
{cgx_2.10 => cgx_2.11}/src/sword.c | 0
{cgx_2.10 => cgx_2.11}/src/trackball.c | 0
{cgx_2.10 => cgx_2.11}/src/trackball.h | 0
{cgx_2.10 => cgx_2.11}/src/uselibSNL.cpp | 0
{cgx_2.10 => cgx_2.11}/src/uselibSNL.h | 0
{cgx_2.10 => cgx_2.11}/src/userFunction.c | 14 +-
{cgx_2.10 => cgx_2.11}/src/v_add.c | 0
{cgx_2.10 => cgx_2.11}/src/v_angle.c | 0
{cgx_2.10 => cgx_2.11}/src/v_angle_ref.c | 0
{cgx_2.10 => cgx_2.11}/src/v_betrag.c | 0
{cgx_2.10 => cgx_2.11}/src/v_distA.c | 0
{cgx_2.10 => cgx_2.11}/src/v_matmult.c | 0
{cgx_2.10 => cgx_2.11}/src/v_norm.c | 0
{cgx_2.10 => cgx_2.11}/src/v_prod.c | 0
{cgx_2.10 => cgx_2.11}/src/v_rec2cyl.c | 0
{cgx_2.10 => cgx_2.11}/src/v_result.c | 0
{cgx_2.10 => cgx_2.11}/src/v_rot.c | 0
{cgx_2.10 => cgx_2.11}/src/v_scal.c | 0
{cgx_2.10 => cgx_2.11}/src/v_sprod.c | 0
{cgx_2.10 => cgx_2.11}/src/write2aba.c | 62 ++++--
{cgx_2.10 => cgx_2.11}/src/write2ansys.c | 0
{cgx_2.10 => cgx_2.11}/src/write2aster.c | 0
{cgx_2.10 => cgx_2.11}/src/write2darwin.c | 0
{cgx_2.10 => cgx_2.11}/src/write2dolfyn.c | 0
{cgx_2.10 => cgx_2.11}/src/write2duns.c | 0
{cgx_2.10 => cgx_2.11}/src/write2foam.c | 0
{cgx_2.10 => cgx_2.11}/src/write2frd.c | 0
{cgx_2.10 => cgx_2.11}/src/write2isaac.c | 0
{cgx_2.10 => cgx_2.11}/src/write2nas.c | 0
{cgx_2.10 => cgx_2.11}/src/write2samcef.c | 0
{cgx_2.10 => cgx_2.11}/src/write2tochnog.c | 0
{cgx_2.10 => cgx_2.11}/src/writebp.c | 0
{cgx_2.10 => cgx_2.11}/src/writefbd.c | 0
{cgx_2.10 => cgx_2.11}/src/xwd.h | 0
206 files changed, 640 insertions(+), 471 deletions(-)
diff --git a/cgx_2.10/examples/airfoil/ISAAC/isaac.fbd b/cgx_2.10/examples/airfoil/ISAAC/isaac.fbd
deleted file mode 100644
index e69de29..0000000
diff --git a/cgx_2.10/examples/airfoil/ccx/send.fbl b/cgx_2.10/examples/airfoil/ccx/send.fbl
deleted file mode 100644
index e9bc8be..0000000
--- a/cgx_2.10/examples/airfoil/ccx/send.fbl
+++ /dev/null
@@ -1,26 +0,0 @@
-read ../rae2822.fbd
-del me
-div bl 6
-bia bl 1
-div all mult 2
-seta tedge p P001
-swep all s2 tra 0 0 0.1 1 append
-comp in do
-comp out do
-comp profil do
-setr profil se tedge
-elty all
-elty all he8f
-mesh all
-send profil abq nam
-send in abq nam
-send out abq nam
-send profil abq surf
-send profil abq slide s
-send profil abq dflux 0.
-send all abq
-plot e all
-view ed off
-view elem on
-#quit
-
diff --git a/cgx_2.10/examples/airfoil/ccx/send_penta.fbl b/cgx_2.10/examples/airfoil/ccx/send_penta.fbl
deleted file mode 100644
index 148f4b3..0000000
--- a/cgx_2.10/examples/airfoil/ccx/send_penta.fbl
+++ /dev/null
@@ -1,19 +0,0 @@
-read rae2822_penta.fbd
-comp in do
-comp out do
-comp profil do
-setr profil se tedge
-mesh all
-swep all s2 tra 0 0 0.1 1 append
-comp profil do
-send profil abq nam
-send in abq nam
-send out abq nam
-send profil abq surf
-send profil abq slide s
-send profil abq dflux 0.
-send all abq
-plot e all
-view ed off
-view elem on
-
diff --git a/cgx_2.10/examples/airfoil/ccx/send_penta.fbl~ b/cgx_2.10/examples/airfoil/ccx/send_penta.fbl~
deleted file mode 100644
index 4ce4ee8..0000000
--- a/cgx_2.10/examples/airfoil/ccx/send_penta.fbl~
+++ /dev/null
@@ -1,18 +0,0 @@
-read rae2822_penta.fbd
-comp in do
-comp out do
-comp profil do
-setr profil se tedge
-mesh all
-swep all s2 tra 0 0 0.1 1 append
-send profil abq nam
-send in abq nam
-send out abq nam
-send profil abq surf
-send profil abq slide s
-send profil abq dflux 0.
-send all abq
-plot e all
-view ed off
-view elem on
-
diff --git a/cgx_2.10/CHANGES b/cgx_2.11/CHANGES
similarity index 98%
rename from cgx_2.10/CHANGES
rename to cgx_2.11/CHANGES
index 5073203..154e86d 100644
--- a/cgx_2.10/CHANGES
+++ b/cgx_2.11/CHANGES
@@ -7,6 +7,25 @@ cgx Change Log
NOTE: This document is potentially incomplete.
+cgx 2.10 -> cgx 2.11
+---------------------
+ o Changed menu function:
+ In the previous versions of cgx the "vMises" strain was calculated with
+ the same algorithm as used for the vMises stress. This is now corrected to
+ vMises_strain=2./3.*stressAlgorithm
+
+ o Changed or extended commands:
+ - elty be2f,be3f elements for fluid networks (ccx: *ELEMENT,TYPE=D).
+ - send: parameter 'cr'<temp|node> for cavity radiation conditions with
+ uniform emissivity and sink temperature or sink node is available.
+
+ o New commands:
+ - fil: Command line version of qfil.
+ - grpa: Assigns a group number to certain elements stored in a certain set.
+ The group number is an element attribute used in the frd file.
+ - int: Command line version of qint.
+
+
cgx 2.9 -> cgx 2.10
---------------------
o Changed or extended commands:
diff --git a/cgx_2.10/COPYING b/cgx_2.11/COPYING
similarity index 100%
rename from cgx_2.10/COPYING
rename to cgx_2.11/COPYING
diff --git a/cgx_2.10/INSTALL b/cgx_2.11/INSTALL
similarity index 86%
rename from cgx_2.10/INSTALL
rename to cgx_2.11/INSTALL
index c933872..0d2d29d 100644
--- a/cgx_2.10/INSTALL
+++ b/cgx_2.11/INSTALL
@@ -1,4 +1,4 @@
- We 16. Dez 21:09:09 CET 2015 in Munich (Germany),
+ 28. Jul 16:03:24 CET 2016 in Munich (Germany),
written by Klaus Wittig (klaus.wittig at calculix.de)
@@ -21,8 +21,9 @@
- pstops (from psutils)
- firefox or any other html-browser (modify cgx.h if not firefox )
- gv (ghostview) (modify cgx.h if not gv )
+ - gnuplot
- ng_vol from the netgen project. Replace this file with the one located
- in the folder cgx_2.10/netgen and build it in the netgen directory.
+ in the folder cgx_2.11/netgen and build it in the netgen directory.
This allows tet-meshing with a target-element-size.
@@ -30,7 +31,7 @@
--------------------------
1. Get the binary and do the following
- - bunzip2 cgx_2.10.bz2 (beware your browser could scip the ending
+ - bunzip2 cgx_2.11.bz2 (beware your browser could scip the ending
.bz2, then please rename the filename to the above one before unzipping )
It is necessary to have openGL on your system!
@@ -50,7 +51,7 @@
2. login as root
3. if possible rename the binary to /usr/local/bin/cgx
- mv cgx_2.10 /usr/local/bin/cgx
+ mv cgx_2.11 /usr/local/bin/cgx
chmod ao+rx /usr/local/bin/cgx
4. If you like the help-system to work then please do the following:
@@ -58,15 +59,15 @@
5. login as root if not already done.
4. get the documentation (html) and do the following:
- - move the file containing the docu cgx_2.10.htm.tar.bz2 to /usr/local
- - bunzip2 cgx_2.10.htm.tar.bz2 (beware sometimes the ending .bz2 is missed,
+ - move the file containing the docu cgx_2.11.htm.tar.bz2 to /usr/local
+ - bunzip2 cgx_2.11.htm.tar.bz2 (beware sometimes the ending .bz2 is missed,
please rename the filename to the above one)
- - tar -xvf cgx_2.10.htm.tar
+ - tar -xvf cgx_2.11.htm.tar
- the html-browser must be known as "firefox"
so if you dont have firefox you should create an link like:
ln -s <your browser location> /usr/local/bin/firefox
- 7. Check the path /usr/local/CalculiX/cgx_2.10/doc/cgx
+ 7. Check the path /usr/local/CalculiX/cgx_2.11/doc/cgx
all the html files should be located there
8. Check the installation, if you performed step 3. type:
@@ -76,12 +77,12 @@
Press the left mouse button. The menu will appear. Go down to "Help" and
choose "Html Manual cgx".
The browser should open and the documentation should be vissible. If not be
- sure that the documentation is in /usr/local/CalculiX/cgx_2.10/doc/cgx
+ sure that the documentation is in /usr/local/CalculiX/cgx_2.11/doc/cgx
9. get the examples and do the following
- - move the file cgx_2.10.exa.tar.bz2 to /usr/local
- - bunzip2 cgx_2.10.exa.tar.bz2
- - tar -xvf cgx_2.10.exa.tar.bz2
+ - move the file cgx_2.11.exa.tar.bz2 to /usr/local
+ - bunzip2 cgx_2.11.exa.tar.bz2
+ - tar -xvf cgx_2.11.exa.tar.bz2
@@ -116,7 +117,7 @@
/usr/lib64/
otherwhise you have to modify the file:
- /usr/local/CalculiX/cgx_2.10/src/Makefile
+ /usr/local/CalculiX/cgx_2.11/src/Makefile
If you do not have this libs or if you
have any trouble later on, then first check the CD from your distribution.
@@ -124,10 +125,10 @@
The original glut package from mark Kilgard is now in the distribution and
will be compiled with the other source files.
- 1. Unpack the file cgx_2.10.all.tar.bz2 in "/usr/local".
+ 1. Unpack the file cgx_2.11.all.tar.bz2 in "/usr/local".
2. Then change to the following directory with:
- cd /usr/local/CalculiX/cgx_2.10/src
+ cd /usr/local/CalculiX/cgx_2.11/src
3. Change the path names in the Makefile to the ones used on your system if
necessary.
@@ -153,10 +154,10 @@
chmod ao+rx /usr/local/bin/cgx
6. If you have "latex" and "latex2html" on your system then run "latex cgx"
- in "/usr/local/CalculiX/cgx_2.10/doc" (run it 3 times!!!) and then run
+ in "/usr/local/CalculiX/cgx_2.11/doc" (run it 3 times!!!) and then run
"latex2html cgx".
This creates the html-help-files. Alternatively you might download them
- as well. Then get cgx_2.10.htm.tar.bz2 and unpack this package in
+ as well. Then get cgx_2.11.htm.tar.bz2 and unpack this package in
/usr/local/.
7. The program needs to write an info file to your home directory during run
@@ -171,12 +172,12 @@
Press the left mouse button. The menu will appear. Go down to "Help" and
choose "Html Manual (cgx)".
The browser should open and the documentation should be vissible. If not be
- sure that the documentation is in /usr/local/CalculiX/cgx_2.10/doc/cgx
+ sure that the documentation is in /usr/local/CalculiX/cgx_2.11/doc/cgx
9. get the examples and do the following
- - move the file cgx_2.10.exa.tar.bz2 to /usr/local
- - bunzip2 cgx_2.10.exa.tar.bz2
- - tar -xvf cgx_2.10.exa.tar.bz2
+ - move the file cgx_2.11.exa.tar.bz2 to /usr/local
+ - bunzip2 cgx_2.11.exa.tar.bz2
+ - tar -xvf cgx_2.11.exa.tar.bz2
diff --git a/cgx_2.10/README b/cgx_2.11/README
similarity index 100%
rename from cgx_2.10/README
rename to cgx_2.11/README
diff --git a/cgx_2.10/examples/README b/cgx_2.11/examples/README
similarity index 100%
rename from cgx_2.10/examples/README
rename to cgx_2.11/examples/README
diff --git a/cgx_2.10/examples/airfoil/ISAAC/RAE2822.hdr b/cgx_2.11/examples/airfoil/ISAAC/RAE2822.hdr
similarity index 100%
rename from cgx_2.10/examples/airfoil/ISAAC/RAE2822.hdr
rename to cgx_2.11/examples/airfoil/ISAAC/RAE2822.hdr
diff --git a/cgx_2.10/examples/airfoil/ISAAC/README b/cgx_2.11/examples/airfoil/ISAAC/README
similarity index 100%
rename from cgx_2.10/examples/airfoil/ISAAC/README
rename to cgx_2.11/examples/airfoil/ISAAC/README
diff --git a/cgx_2.10/examples/airfoil/ISAAC/isaac.fbl b/cgx_2.11/examples/airfoil/ISAAC/isaac.fbl
similarity index 100%
rename from cgx_2.10/examples/airfoil/ISAAC/isaac.fbl
rename to cgx_2.11/examples/airfoil/ISAAC/isaac.fbl
diff --git a/cgx_2.10/examples/airfoil/ccx/README b/cgx_2.11/examples/airfoil/ccx/README
similarity index 71%
rename from cgx_2.10/examples/airfoil/ccx/README
rename to cgx_2.11/examples/airfoil/ccx/README
index 014b527..e86a18d 100644
--- a/cgx_2.10/examples/airfoil/ccx/README
+++ b/cgx_2.11/examples/airfoil/ccx/README
@@ -27,13 +27,22 @@ send all abq lc<nr-of-dataset> (3 times, one for each dataset)
Then include the files in the initial conditions section and
start ccx again
+You may also start with a coarse mesh and after a certain convergence is
+reached you map the results to a finer mesh (see "map" in the manual)
PS
-a second geometry file prepared for meshing with pentaeders is provided. The
-calculation speed is faster but accuray is lower:
+a second geometry file prepared for meshing with penta- and tetraeders is provided. The
+calculation speed is much faster but accuray is lower:
call cgx in the build mode:
cgx -b send_penta.fbl
export OMP_NUM_THREADS=4; ccx rae2822_penta
cgx rae2822_penta.frd
+tets are still experimental. You may try:
+
+ cgx -b send_tetra.fbl
+ export OMP_NUM_THREADS=4; ccx rae2822_tetra
+ cgx rae2822_tetra.frd
+
+
diff --git a/cgx_2.11/examples/airfoil/ccx/clean b/cgx_2.11/examples/airfoil/ccx/clean
new file mode 100755
index 0000000..14e6ad7
--- /dev/null
+++ b/cgx_2.11/examples/airfoil/ccx/clean
@@ -0,0 +1 @@
+rm -rf *msh *equ *bouf *mfl *dfl *sur *nam *frd *sta *dat *cvg
diff --git a/cgx_2.10/examples/airfoil/ccx/rae2822.inp b/cgx_2.11/examples/airfoil/ccx/rae2822.inp
similarity index 50%
rename from cgx_2.10/examples/airfoil/ccx/rae2822.inp
rename to cgx_2.11/examples/airfoil/ccx/rae2822.inp
index 3feb387..f427664 100644
--- a/cgx_2.10/examples/airfoil/ccx/rae2822.inp
+++ b/cgx_2.11/examples/airfoil/ccx/rae2822.inp
@@ -5,16 +5,11 @@
*include, input=all.msh
*include, input=in.nam
*include, input=out.nam
-** nodes of the profil
-*include, input=profil.nam
-** eqations force flow in direction of the profil
-*include, input=profil.equ
** surfaces for drag calc
-*SURFACE,NAME=AIRFOIL
*include, input=profil.sur
*MATERIAL,NAME=AIR
*CONDUCTIVITY
-0.
+0.025
*FLUID CONSTANTS
1004.85,1.786e-5,288.
*SPECIFIC GAS CONSTANT
@@ -30,21 +25,29 @@ Nall,1.e5
*INITIAL CONDITIONS,TYPE=TEMPERATURE
Nall,288.
**
-*STEP,INCF=60000
-*STATIC,EXPLICIT
+*STEP,INCF=100000
+***CFD,STEADY STATE, COMPRESSIBLE
+*CFD, COMPRESSIBLE
1.,1.
-*DFLUX
-*include, input=profil.dfl
-*BOUNDARY
-Nin,11,11,288.
-Nin,1,1,248.
-Nin,2,3,0.
-Nout,8,8,1.e5
-Nprofil,3,3,0.
+*BOUNDARYF
+*include, input=in_11.bouf
+*include, input=in_1.bouf
+*include, input=in_2.bouf
+*include, input=in_3.bouf
+*include, input=out_8.bouf
** for viscous flow set this to:
-** Nprofil,1,3,0.
-*NODE FILE,FREQUENCYF=1000
-V,PS,TS,TT,MACH
-*FACE PRINT,SURFACE=AIRFOIL,FREQUENCYF=1000
+**include, input=profil_1.bouf
+**include, input=profil_2.bouf
+*MASS FLOW
+*include, input=s1.mfl
+*include, input=s2.mfl
+*include, input=wall.mfl
+** for inviscid flow set this to:
+*include, input=profil.mfl
+*NODE FILE,FREQUENCYF=500,NSET=Nall
+VF,PSF,PTF,TSF,TTF,MACH,CP
+*EL FILE,FREQUENCYF=500,ELSET=Eall
+SF,SVF,HFLF
+*FACE PRINT,SURFACE=Sprofil,FREQUENCYF=500
DRAG
*END STEP
diff --git a/cgx_2.10/examples/airfoil/ccx/rae2822_penta.fbd b/cgx_2.11/examples/airfoil/ccx/rae2822_penta.fbd
similarity index 84%
rename from cgx_2.10/examples/airfoil/ccx/rae2822_penta.fbd
rename to cgx_2.11/examples/airfoil/ccx/rae2822_penta.fbd
index ae50cb5..b9d0c82 100644
--- a/cgx_2.10/examples/airfoil/ccx/rae2822_penta.fbd
+++ b/cgx_2.11/examples/airfoil/ccx/rae2822_penta.fbd
@@ -221,13 +221,10 @@
LINE L01A P08K P089 S00I 108
LINE L00C P08I P08O S003 108
LINE L01D P08O P088 S00C 108
- LCMB C004 + L01U + L01V
- LCMB C006 + L01I - L01V - L01U - L01E
- LCMB C007 + L001 + L00C + L01D
- LCMB C009 + L009 + L01A
- SHPE H001 PLN P005 P002 P003
- GSUR A001 + H001 + L002 + L003 + L004 + L007 + L01E + L01U + L01V
- GSUR A001 ADD - L01I - L01A - L009 + L001 + L00C + L01D
+ SHPE H001 PLN P005 P002 P003
+ GSUR A001 + H001 + L002 + L003 + L004 + L007 + L01E + L01U + L01V - L01I
+ GSUR A001 ADD - L01A - L009 + L001 + L00C + L01D
+ SETA flps l L01I L01A L009
SETA profil p P088
SETA profil p P01F
SETA profil p P01H
@@ -427,6 +424,8 @@
SETA wall p P003
SETA wall p P004
SETA wall p P005
+ SETA wall l L003
+ SETA wall l L007
SETA in p P002
SETA in p P005
SETA in l L004
@@ -624,210 +623,16 @@
SETA far p P003
SETA far p P004
SETA far p P005
- SETA s1 p P088
- SETA s1 p P01F
- SETA s1 p P01H
- SETA s1 p P01I
- SETA s1 p P01J
- SETA s1 p P01K
- SETA s1 p P01L
- SETA s1 p P01M
- SETA s1 p P01N
- SETA s1 p P01P
- SETA s1 p P01Q
- SETA s1 p P01R
- SETA s1 p P01S
- SETA s1 p P01T
- SETA s1 p P01U
- SETA s1 p P01V
- SETA s1 p P01X
- SETA s1 p P01Y
- SETA s1 p P020
- SETA s1 p P022
- SETA s1 p P024
- SETA s1 p P026
- SETA s1 p P028
- SETA s1 p P029
- SETA s1 p P02B
- SETA s1 p P02D
- SETA s1 p P02E
- SETA s1 p P02F
- SETA s1 p P02G
- SETA s1 p P02I
- SETA s1 p P02J
- SETA s1 p P02K
- SETA s1 p P02L
- SETA s1 p P02M
- SETA s1 p P02O
- SETA s1 p P02Q
- SETA s1 p P02R
- SETA s1 p P02T
- SETA s1 p P02U
- SETA s1 p P02V
- SETA s1 p P02W
- SETA s1 p P02Y
- SETA s1 p P02Z
- SETA s1 p P030
- SETA s1 p P031
- SETA s1 p P032
- SETA s1 p P033
- SETA s1 p P034
- SETA s1 p P036
- SETA s1 p P037
- SETA s1 p P039
- SETA s1 p P03A
- SETA s1 p P03B
- SETA s1 p P03C
- SETA s1 p P03E
- SETA s1 p P03F
- SETA s1 p P03G
- SETA s1 p P03H
- SETA s1 p P03I
- SETA s1 p P03J
- SETA s1 p P03K
- SETA s1 p P03M
- SETA s1 p P03N
- SETA s1 p P03O
- SETA s1 p P03P
- SETA s1 p P03R
- SETA s1 p P03S
- SETA s1 p P03U
- SETA s1 p P03V
- SETA s1 p P03W
- SETA s1 p P03X
- SETA s1 p P03Z
- SETA s1 p P040
- SETA s1 p P041
- SETA s1 p P043
- SETA s1 p P044
- SETA s1 p P045
- SETA s1 p P046
- SETA s1 p P048
- SETA s1 p P049
- SETA s1 p P04B
- SETA s1 p P04C
- SETA s1 p P04D
- SETA s1 p P04E
- SETA s1 p P04G
- SETA s1 p P04H
- SETA s1 p P04I
- SETA s1 p P04J
- SETA s1 p P04L
- SETA s1 p P04M
- SETA s1 p P04N
- SETA s1 p P04P
- SETA s1 p P04Q
- SETA s1 p P04R
- SETA s1 p P04T
- SETA s1 p P04V
- SETA s1 p P04W
- SETA s1 p P04X
- SETA s1 p P04Z
- SETA s1 p P050
- SETA s1 p P052
- SETA s1 p P054
- SETA s1 p P056
- SETA s1 p P058
- SETA s1 p P059
- SETA s1 p P05A
- SETA s1 p P05C
- SETA s1 p P05D
- SETA s1 p P05F
- SETA s1 p P05G
- SETA s1 p P05H
- SETA s1 p P05I
- SETA s1 p P05J
- SETA s1 p P05L
- SETA s1 p P05M
- SETA s1 p P05N
- SETA s1 p P05P
- SETA s1 p P05R
- SETA s1 p P05S
- SETA s1 p P05T
- SETA s1 p P05V
- SETA s1 p P05W
- SETA s1 p P05Y
- SETA s1 p P05Z
- SETA s1 p P060
- SETA s1 p P062
- SETA s1 p P064
- SETA s1 p P066
- SETA s1 p P068
- SETA s1 p P069
- SETA s1 p P06B
- SETA s1 p P06C
- SETA s1 p P06D
- SETA s1 p P06F
- SETA s1 p P06H
- SETA s1 p P06I
- SETA s1 p P06J
- SETA s1 p P06L
- SETA s1 p P06M
- SETA s1 p P06N
- SETA s1 p P06P
- SETA s1 p P06R
- SETA s1 p P06S
- SETA s1 p P06U
- SETA s1 p P06V
- SETA s1 p P06W
- SETA s1 p P06Y
- SETA s1 p P06Z
- SETA s1 p P070
- SETA s1 p P072
- SETA s1 p P074
- SETA s1 p P075
- SETA s1 p P076
- SETA s1 p P078
- SETA s1 p P079
- SETA s1 p P07B
- SETA s1 p P07D
- SETA s1 p P07F
- SETA s1 p P07H
- SETA s1 p P07I
- SETA s1 p P07J
- SETA s1 p P07L
- SETA s1 p P07M
- SETA s1 p P07O
- SETA s1 p P07P
- SETA s1 p P07Q
- SETA s1 p P07R
- SETA s1 p P07S
- SETA s1 p P07U
- SETA s1 p P07V
- SETA s1 p P07W
- SETA s1 p P07Y
- SETA s1 p P080
- SETA s1 p P081
- SETA s1 p P082
- SETA s1 p P083
- SETA s1 p P089
- SETA s1 p P001
- SETA s1 p P002
- SETA s1 p P003
- SETA s1 p P004
- SETA s1 p P005
- SETA s1 p P08G
- SETA s1 p P08I
- SETA s1 p P08K
- SETA s1 p P08O
- SETA s1 l L002
- SETA s1 l L003
- SETA s1 l L004
- SETA s1 l L007
- SETA s1 l L01E
- SETA s1 l L01I
- SETA s1 l L01U
- SETA s1 l L01V
- SETA s1 l L001
- SETA s1 l L009
- SETA s1 l L01A
- SETA s1 l L00C
- SETA s1 l L01D
SETA s1 s A001
- ELTY all TR3U
+ SETA p p P003
+ SETA p p P004
+ SETA p1 p P002
+ SETA p1 p P005
+ ELTY all TR3U
plot p all b
plus l all k
plus s all m
plus b all g
plus sh all m
+ plus pa wall b
diff --git a/cgx_2.10/examples/airfoil/ccx/rae2822_penta.inp b/cgx_2.11/examples/airfoil/ccx/rae2822_penta.inp
similarity index 50%
rename from cgx_2.10/examples/airfoil/ccx/rae2822_penta.inp
rename to cgx_2.11/examples/airfoil/ccx/rae2822_penta.inp
index 3feb387..a934bb4 100644
--- a/cgx_2.10/examples/airfoil/ccx/rae2822_penta.inp
+++ b/cgx_2.11/examples/airfoil/ccx/rae2822_penta.inp
@@ -5,16 +5,11 @@
*include, input=all.msh
*include, input=in.nam
*include, input=out.nam
-** nodes of the profil
-*include, input=profil.nam
-** eqations force flow in direction of the profil
-*include, input=profil.equ
** surfaces for drag calc
-*SURFACE,NAME=AIRFOIL
*include, input=profil.sur
*MATERIAL,NAME=AIR
*CONDUCTIVITY
-0.
+0.025
*FLUID CONSTANTS
1004.85,1.786e-5,288.
*SPECIFIC GAS CONSTANT
@@ -30,21 +25,30 @@ Nall,1.e5
*INITIAL CONDITIONS,TYPE=TEMPERATURE
Nall,288.
**
-*STEP,INCF=60000
-*STATIC,EXPLICIT
+*STEP,INCF=5000
+***CFD,STEADY STATE, COMPRESSIBLE
+*CFD, COMPRESSIBLE
1.,1.
-*DFLUX
-*include, input=profil.dfl
-*BOUNDARY
-Nin,11,11,288.
-Nin,1,1,248.
-Nin,2,3,0.
-Nout,8,8,1.e5
-Nprofil,3,3,0.
+*BOUNDARYF
+*include, input=in_11.bouf
+*include, input=in_1.bouf
+*include, input=in_2.bouf
+*include, input=in_3.bouf
+*include, input=out_8.bouf
** for viscous flow set this to:
-** Nprofil,1,3,0.
-*NODE FILE,FREQUENCYF=1000
-V,PS,TS,TT,MACH
-*FACE PRINT,SURFACE=AIRFOIL,FREQUENCYF=1000
+***include, input=profil_1.bouf
+***include, input=profil_2.bouf
+*MASS FLOW
+*include, input=s1.mfl
+*include, input=s2.mfl
+*include, input=wall.mfl
+** for inviscid flow set this to:
+*include, input=profil.mfl
+**
+*NODE FILE,FREQUENCYF=100,NSET=Nall
+VF,PSF,PTF,TSF,TTF,MACH,CP
+*EL FILE,FREQUENCYF=100,ELSET=Eall
+SF,SVF,HFLF
+*FACE PRINT,SURFACE=Sprofil,FREQUENCYF=100
DRAG
*END STEP
diff --git a/cgx_2.11/examples/airfoil/ccx/rae2822_tetra.inp b/cgx_2.11/examples/airfoil/ccx/rae2822_tetra.inp
new file mode 100644
index 0000000..544a5bb
--- /dev/null
+++ b/cgx_2.11/examples/airfoil/ccx/rae2822_tetra.inp
@@ -0,0 +1,54 @@
+** m, kg, s
+** dyn_visc=kin_visc*rho
+** cp=R/(1-1/kappa)
+**
+*include, input=all.msh
+*include, input=in.nam
+*include, input=out.nam
+** surfaces for drag calc
+*include, input=profil.sur
+*MATERIAL,NAME=AIR
+*CONDUCTIVITY
+0.025
+*FLUID CONSTANTS
+1004.85,1.786e-5,288.
+*SPECIFIC GAS CONSTANT
+287.1
+*SOLID SECTION,ELSET=Eall,MATERIAL=AIR
+*PHYSICAL CONSTANTS,ABSOLUTE ZERO=0.
+*INITIAL CONDITIONS,TYPE=FLUID VELOCITY
+Nall,1,48.
+Nall,2,0.
+Nall,3,0.
+*INITIAL CONDITIONS,TYPE=PRESSURE
+Nall,1.e5
+*INITIAL CONDITIONS,TYPE=TEMPERATURE
+Nall,288.
+**
+*STEP,INCF=5000
+***CFD,STEADY STATE, COMPRESSIBLE
+*CFD, COMPRESSIBLE
+1.,1.
+*BOUNDARYF
+*include, input=in_11.bouf
+*include, input=in_1.bouf
+*include, input=in_2.bouf
+*include, input=in_3.bouf
+*include, input=out_8.bouf
+** for viscous flow set this to:
+***include, input=profil_1.bouf
+***include, input=profil_2.bouf
+*MASS FLOW
+*include, input=s1.mfl
+*include, input=s2.mfl
+*include, input=wall.mfl
+** for inviscid flow set this to:
+*include, input=profil.mfl
+**
+*NODE FILE,FREQUENCYF=100,NSET=Nall
+VF,PSF,PTF,TSF,TTF,MACH,CP
+*EL FILE,FREQUENCYF=100,ELSET=Eall
+SF,SVF,HFLF
+*FACE PRINT,SURFACE=Sprofil,FREQUENCYF=100
+DRAG
+*END STEP
diff --git a/cgx_2.11/examples/airfoil/ccx/send.fbl b/cgx_2.11/examples/airfoil/ccx/send.fbl
new file mode 100644
index 0000000..a32fbdc
--- /dev/null
+++ b/cgx_2.11/examples/airfoil/ccx/send.fbl
@@ -0,0 +1,43 @@
+sys rm -rf *bouf *mfl *dfl *sur *nam
+read ../rae2822.fbd
+del me
+#div bl 6
+#bia bl 1
+div bl div 4
+bia bl div 200
+#div all mult 2
+seta tedge p P001
+swep all s2 tra 0 0 0.1 1 append
+setr s1 b all
+setr s1 se s2
+comp s1 do
+comp in do
+comp out do
+comp profil do
+setr profil se tedge
+elty all
+elty all he8f
+mesh all
+send s1 abq mflow 0.
+send s2 abq mflow 0.
+comp profil do
+comp profil do
+send profil abq nam
+send in abq nam
+send in abq spcf 1 248.
+send in abq spcf 23 0.
+send in abq spcf t 288.
+send out abq nam
+send out abq spcf p 1.e5
+send profil abq sur
+send profil abq spcf 12 0.
+send profil abq mflow 0.
+send wall abq spcf 2 0.
+send wall abq mflow 0.
+send all abq
+plot f all
+view ed off
+view elem on
+rot z
+#quit
+
diff --git a/cgx_2.11/examples/airfoil/ccx/send_penta.fbl b/cgx_2.11/examples/airfoil/ccx/send_penta.fbl
new file mode 100644
index 0000000..a3a0435
--- /dev/null
+++ b/cgx_2.11/examples/airfoil/ccx/send_penta.fbl
@@ -0,0 +1,36 @@
+sys rm -rf *bouf *mfl *dfl *sur *nam
+read rae2822_penta.fbd
+comp in do
+comp out do
+comp profil do
+mesh all
+swep all s2 tra 0 0 0.1 1 append
+elty all pe6f
+comp in do
+comp out do
+comp wall do
+comp profil do
+# recover the right side of the volume
+setr s1 se s2
+setr s1 e all
+comp s1 do
+comp s1 do
+comp s2 do
+send s1 abq mflow 0.
+send s2 abq mflow 0.
+send in abq nam
+send in abq spcf 1 248.
+send in abq spcf 23 0.
+send in abq spcf t 288.
+send out abq nam
+send out abq spcf p 1.e5
+send profil abq sur
+send profil abq spcf 12 0.
+send profil abq mflow 0.
+send wall abq spcf 2 0.
+send wall abq mflow 0.
+send all abq
+plot e all
+view ed off
+view elem on
+#quit
diff --git a/cgx_2.11/examples/airfoil/ccx/send_tetra.fbl b/cgx_2.11/examples/airfoil/ccx/send_tetra.fbl
new file mode 100644
index 0000000..66f494e
--- /dev/null
+++ b/cgx_2.11/examples/airfoil/ccx/send_tetra.fbl
@@ -0,0 +1,48 @@
+sys rm -rf *bouf *mfl *dfl *sur *nam
+read rae2822_penta.fbd
+comp in do
+comp out do
+comp profil do
+swep all s2 tra 0 0 0.1 1 append
+# recover the right side of the volume
+setr s1 se s2
+comp s1 do
+flip all
+flip s2
+flip flps
+elty all tr3u
+mesh all
+mesh all tet
+elty all te4f
+# cgx error: faces are corrupt, have to be restored
+setr s1 f all
+setr s2 f all
+setr in f all
+setr out f all
+setr wall f all
+setr profil f all
+comp s1 do
+comp s2 do
+comp in do
+comp out do
+comp wall do
+comp profil do
+#break
+send s1 abq mflow 0.
+send s2 abq mflow 0.
+send in abq nam
+send in abq spcf 1 48.
+send in abq spcf 23 0.
+send in abq spcf t 288.
+send out abq nam
+send out abq spcf p 1.e5
+send profil abq sur
+send profil abq spcf 12 0.
+send profil abq mflow 0.
+send wall abq spcf 2 0.
+send wall abq mflow 0.
+send all abq
+plot e all
+view ed off
+view elem on
+#quit
diff --git a/cgx_2.10/examples/airfoil/rae2822.fbd b/cgx_2.11/examples/airfoil/rae2822.fbb
similarity index 100%
copy from cgx_2.10/examples/airfoil/rae2822.fbd
copy to cgx_2.11/examples/airfoil/rae2822.fbb
diff --git a/cgx_2.10/examples/airfoil/rae2822.fbd b/cgx_2.11/examples/airfoil/rae2822.fbd
similarity index 98%
rename from cgx_2.10/examples/airfoil/rae2822.fbd
rename to cgx_2.11/examples/airfoil/rae2822.fbd
index e54cd6c..9968188 100644
--- a/cgx_2.10/examples/airfoil/rae2822.fbd
+++ b/cgx_2.11/examples/airfoil/rae2822.fbd
@@ -866,7 +866,24 @@
SETA bl l L00A
SETA bl l L01F
SETA bl l L01J
- ELTY all QU4
+ SETA s1 s A001
+ SETA s1 s A002
+ SETA s1 s A003
+ SETA s1 s A004
+ SETA s1 s A005
+ SETA s1 s A006
+ SETA s1 s A007
+ SETA s1 s A008
+ SETA s1 s A009
+ SETA s1 s A00A
+ SETA s1 s A00C
+ SETA s1 s A00E
+ SETA s1 s A00G
+ SETA s1 s A00K
+ SETA s1 s A00L
+ SETA s1 s A00I
+ SETA s1 s A00J
+ ELTY all QU4
plot p all b
plus l all k
plus s all m
diff --git a/cgx_2.10/examples/basic/cylinder.fbd b/cgx_2.11/examples/basic/cylinder.fbd
similarity index 100%
rename from cgx_2.10/examples/basic/cylinder.fbd
rename to cgx_2.11/examples/basic/cylinder.fbd
diff --git a/cgx_2.10/examples/basic/disc.fbd b/cgx_2.11/examples/basic/disc.fbd
similarity index 100%
rename from cgx_2.10/examples/basic/disc.fbd
rename to cgx_2.11/examples/basic/disc.fbd
diff --git a/cgx_2.10/examples/basic/sphere.fbd b/cgx_2.11/examples/basic/sphere.fbd
similarity index 100%
rename from cgx_2.10/examples/basic/sphere.fbd
rename to cgx_2.11/examples/basic/sphere.fbd
diff --git a/cgx_2.10/examples/basic/sphere_seg.fbd b/cgx_2.11/examples/basic/sphere_seg.fbd
similarity index 100%
rename from cgx_2.10/examples/basic/sphere_seg.fbd
rename to cgx_2.11/examples/basic/sphere_seg.fbd
diff --git a/cgx_2.10/examples/basic/sphere_vol.fbd b/cgx_2.11/examples/basic/sphere_vol.fbd
similarity index 100%
rename from cgx_2.10/examples/basic/sphere_vol.fbd
rename to cgx_2.11/examples/basic/sphere_vol.fbd
diff --git a/cgx_2.10/examples/cad/README b/cgx_2.11/examples/cad/README
similarity index 100%
rename from cgx_2.10/examples/cad/README
rename to cgx_2.11/examples/cad/README
diff --git a/cgx_2.10/examples/cad/halter.fbd b/cgx_2.11/examples/cad/halter.fbd
similarity index 100%
rename from cgx_2.10/examples/cad/halter.fbd
rename to cgx_2.11/examples/cad/halter.fbd
diff --git a/cgx_2.10/examples/cad/halter.vda b/cgx_2.11/examples/cad/halter.vda
similarity index 100%
rename from cgx_2.10/examples/cad/halter.vda
rename to cgx_2.11/examples/cad/halter.vda
diff --git a/cgx_2.10/examples/clean b/cgx_2.11/examples/clean
similarity index 100%
rename from cgx_2.10/examples/clean
rename to cgx_2.11/examples/clean
diff --git a/cgx_2.10/examples/compressor/README b/cgx_2.11/examples/compressor/README
similarity index 100%
rename from cgx_2.10/examples/compressor/README
rename to cgx_2.11/examples/compressor/README
diff --git a/cgx_2.10/examples/compressor/lavff.fbd b/cgx_2.11/examples/compressor/lavff.fbd
similarity index 100%
rename from cgx_2.10/examples/compressor/lavff.fbd
rename to cgx_2.11/examples/compressor/lavff.fbd
diff --git a/cgx_2.10/examples/compressor/lavffcyc.inp b/cgx_2.11/examples/compressor/lavffcyc.inp
similarity index 100%
rename from cgx_2.10/examples/compressor/lavffcyc.inp
rename to cgx_2.11/examples/compressor/lavffcyc.inp
diff --git a/cgx_2.10/examples/compressor/send.fbl b/cgx_2.11/examples/compressor/send.fbl
similarity index 100%
rename from cgx_2.10/examples/compressor/send.fbl
rename to cgx_2.11/examples/compressor/send.fbl
diff --git a/cgx_2.10/examples/dolfyn/README b/cgx_2.11/examples/dolfyn/README
similarity index 100%
rename from cgx_2.10/examples/dolfyn/README
rename to cgx_2.11/examples/dolfyn/README
diff --git a/cgx_2.10/examples/dolfyn/cgx.patch b/cgx_2.11/examples/dolfyn/cgx.patch
similarity index 100%
rename from cgx_2.10/examples/dolfyn/cgx.patch
rename to cgx_2.11/examples/dolfyn/cgx.patch
diff --git a/cgx_2.10/examples/dolfyn/mirror/clean.sh b/cgx_2.11/examples/dolfyn/mirror/clean.sh
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/clean.sh
rename to cgx_2.11/examples/dolfyn/mirror/clean.sh
diff --git a/cgx_2.10/examples/dolfyn/mirror/dolfyn.cfg b/cgx_2.11/examples/dolfyn/mirror/dolfyn.cfg
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/dolfyn.cfg
rename to cgx_2.11/examples/dolfyn/mirror/dolfyn.cfg
diff --git a/cgx_2.10/examples/dolfyn/mirror/rename.sh b/cgx_2.11/examples/dolfyn/mirror/rename.sh
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/rename.sh
rename to cgx_2.11/examples/dolfyn/mirror/rename.sh
diff --git a/cgx_2.10/examples/dolfyn/mirror/spiegel.din b/cgx_2.11/examples/dolfyn/mirror/spiegel.din
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/spiegel.din
rename to cgx_2.11/examples/dolfyn/mirror/spiegel.din
diff --git a/cgx_2.10/examples/dolfyn/mirror/spiegel.fbd b/cgx_2.11/examples/dolfyn/mirror/spiegel.fbd
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/spiegel.fbd
rename to cgx_2.11/examples/dolfyn/mirror/spiegel.fbd
diff --git a/cgx_2.10/examples/dolfyn/mirror/spiegel.inp b/cgx_2.11/examples/dolfyn/mirror/spiegel.inp
similarity index 100%
rename from cgx_2.10/examples/dolfyn/mirror/spiegel.inp
rename to cgx_2.11/examples/dolfyn/mirror/spiegel.inp
diff --git a/cgx_2.10/examples/geometry.fbd b/cgx_2.11/examples/geometry.fbd
similarity index 100%
rename from cgx_2.10/examples/geometry.fbd
rename to cgx_2.11/examples/geometry.fbd
diff --git a/cgx_2.10/examples/glue/README b/cgx_2.11/examples/glue/README
similarity index 100%
rename from cgx_2.10/examples/glue/README
rename to cgx_2.11/examples/glue/README
diff --git a/cgx_2.10/examples/glue/latjm.fbd b/cgx_2.11/examples/glue/latjm.fbd
similarity index 100%
rename from cgx_2.10/examples/glue/latjm.fbd
rename to cgx_2.11/examples/glue/latjm.fbd
diff --git a/cgx_2.10/examples/glue/latjm.inp b/cgx_2.11/examples/glue/latjm.inp
similarity index 100%
rename from cgx_2.10/examples/glue/latjm.inp
rename to cgx_2.11/examples/glue/latjm.inp
diff --git a/cgx_2.10/examples/glue/send.fbl b/cgx_2.11/examples/glue/send.fbl
similarity index 100%
rename from cgx_2.10/examples/glue/send.fbl
rename to cgx_2.11/examples/glue/send.fbl
diff --git a/cgx_2.10/examples/ifwhiledemo/all.fbd b/cgx_2.11/examples/ifwhiledemo/all.fbd
similarity index 100%
rename from cgx_2.10/examples/ifwhiledemo/all.fbd
rename to cgx_2.11/examples/ifwhiledemo/all.fbd
diff --git a/cgx_2.10/examples/ifwhiledemo/ifwhiledemo.fbl b/cgx_2.11/examples/ifwhiledemo/ifwhiledemo.fbl
similarity index 100%
rename from cgx_2.10/examples/ifwhiledemo/ifwhiledemo.fbl
rename to cgx_2.11/examples/ifwhiledemo/ifwhiledemo.fbl
diff --git a/cgx_2.10/examples/ifwhiledemo/writedemo.txt b/cgx_2.11/examples/ifwhiledemo/writedemo.txt
similarity index 100%
rename from cgx_2.10/examples/ifwhiledemo/writedemo.txt
rename to cgx_2.11/examples/ifwhiledemo/writedemo.txt
diff --git a/cgx_2.10/examples/map/README b/cgx_2.11/examples/map/README
similarity index 100%
rename from cgx_2.10/examples/map/README
rename to cgx_2.11/examples/map/README
diff --git a/cgx_2.10/examples/map/map2D.fbl b/cgx_2.11/examples/map/map2D.fbl
similarity index 100%
rename from cgx_2.10/examples/map/map2D.fbl
rename to cgx_2.11/examples/map/map2D.fbl
diff --git a/cgx_2.10/examples/map/map3D.fbl b/cgx_2.11/examples/map/map3D.fbl
similarity index 100%
rename from cgx_2.10/examples/map/map3D.fbl
rename to cgx_2.11/examples/map/map3D.fbl
diff --git a/cgx_2.10/examples/map/pressure.bak b/cgx_2.11/examples/map/pressure.bak
similarity index 100%
rename from cgx_2.10/examples/map/pressure.bak
rename to cgx_2.11/examples/map/pressure.bak
diff --git a/cgx_2.10/examples/pressfit/README b/cgx_2.11/examples/pressfit/README
similarity index 100%
rename from cgx_2.10/examples/pressfit/README
rename to cgx_2.11/examples/pressfit/README
diff --git a/cgx_2.10/examples/pressfit/flange.fbd b/cgx_2.11/examples/pressfit/flange.fbd
similarity index 100%
rename from cgx_2.10/examples/pressfit/flange.fbd
rename to cgx_2.11/examples/pressfit/flange.fbd
diff --git a/cgx_2.10/examples/pressfit/flange.inp b/cgx_2.11/examples/pressfit/flange.inp
similarity index 100%
rename from cgx_2.10/examples/pressfit/flange.inp
rename to cgx_2.11/examples/pressfit/flange.inp
diff --git a/cgx_2.10/examples/pressfit/hcpy_1.png b/cgx_2.11/examples/pressfit/hcpy_1.png
similarity index 100%
rename from cgx_2.10/examples/pressfit/hcpy_1.png
rename to cgx_2.11/examples/pressfit/hcpy_1.png
diff --git a/cgx_2.10/examples/pressfit/send.fbl b/cgx_2.11/examples/pressfit/send.fbl
similarity index 100%
rename from cgx_2.10/examples/pressfit/send.fbl
rename to cgx_2.11/examples/pressfit/send.fbl
diff --git a/cgx_2.10/examples/result.frd b/cgx_2.11/examples/result.frd
similarity index 100%
rename from cgx_2.10/examples/result.frd
rename to cgx_2.11/examples/result.frd
diff --git a/cgx_2.10/examples/swepElements/README b/cgx_2.11/examples/swepElements/README
similarity index 100%
rename from cgx_2.10/examples/swepElements/README
rename to cgx_2.11/examples/swepElements/README
diff --git a/cgx_2.10/examples/swepElements/ring1.fbd b/cgx_2.11/examples/swepElements/ring1.fbd
similarity index 100%
rename from cgx_2.10/examples/swepElements/ring1.fbd
rename to cgx_2.11/examples/swepElements/ring1.fbd
diff --git a/cgx_2.10/examples/swepElements/ring1.fbl b/cgx_2.11/examples/swepElements/ring1.fbl
similarity index 100%
rename from cgx_2.10/examples/swepElements/ring1.fbl
rename to cgx_2.11/examples/swepElements/ring1.fbl
diff --git a/cgx_2.10/examples/swepElements/ring1.inp b/cgx_2.11/examples/swepElements/ring1.inp
similarity index 100%
rename from cgx_2.10/examples/swepElements/ring1.inp
rename to cgx_2.11/examples/swepElements/ring1.inp
diff --git a/cgx_2.10/examples/therm/README b/cgx_2.11/examples/therm/README
similarity index 100%
rename from cgx_2.10/examples/therm/README
rename to cgx_2.11/examples/therm/README
diff --git a/cgx_2.10/examples/therm/latimtrans.inp b/cgx_2.11/examples/therm/latimtrans.inp
similarity index 100%
rename from cgx_2.10/examples/therm/latimtrans.inp
rename to cgx_2.11/examples/therm/latimtrans.inp
diff --git a/cgx_2.10/examples/therm/post.fbl b/cgx_2.11/examples/therm/post.fbl
similarity index 100%
rename from cgx_2.10/examples/therm/post.fbl
rename to cgx_2.11/examples/therm/post.fbl
diff --git a/cgx_2.10/examples/therm/send.fbl b/cgx_2.11/examples/therm/send.fbl
similarity index 100%
rename from cgx_2.10/examples/therm/send.fbl
rename to cgx_2.11/examples/therm/send.fbl
diff --git a/cgx_2.10/examples/turbine/README b/cgx_2.11/examples/turbine/README
similarity index 100%
rename from cgx_2.10/examples/turbine/README
rename to cgx_2.11/examples/turbine/README
diff --git a/cgx_2.10/examples/turbine/latim.fbd b/cgx_2.11/examples/turbine/latim.fbd
similarity index 100%
rename from cgx_2.10/examples/turbine/latim.fbd
rename to cgx_2.11/examples/turbine/latim.fbd
diff --git a/cgx_2.10/examples/turbine/latim.inp b/cgx_2.11/examples/turbine/latim.inp
similarity index 100%
rename from cgx_2.10/examples/turbine/latim.inp
rename to cgx_2.11/examples/turbine/latim.inp
diff --git a/cgx_2.10/examples/turbine/send.fbl b/cgx_2.11/examples/turbine/send.fbl
similarity index 100%
rename from cgx_2.10/examples/turbine/send.fbl
rename to cgx_2.11/examples/turbine/send.fbl
diff --git a/cgx_2.10/netgen/README b/cgx_2.11/netgen/README
similarity index 100%
rename from cgx_2.10/netgen/README
rename to cgx_2.11/netgen/README
diff --git a/cgx_2.10/netgen/ng_vol.cpp b/cgx_2.11/netgen/ng_vol.cpp
similarity index 100%
rename from cgx_2.10/netgen/ng_vol.cpp
rename to cgx_2.11/netgen/ng_vol.cpp
diff --git a/cgx_2.10/netgen/ng_vol.cpp_orig b/cgx_2.11/netgen/ng_vol.cpp_orig
similarity index 100%
rename from cgx_2.10/netgen/ng_vol.cpp_orig
rename to cgx_2.11/netgen/ng_vol.cpp_orig
diff --git a/cgx_2.10/src/AsplitA.c b/cgx_2.11/src/AsplitA.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/AsplitA.c
rename to cgx_2.11/src/AsplitA.c
diff --git a/cgx_2.10/src/AsplitL.c b/cgx_2.11/src/AsplitL.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/AsplitL.c
rename to cgx_2.11/src/AsplitL.c
diff --git a/cgx_2.10/src/Makefile b/cgx_2.11/src/Makefile
similarity index 100%
rename from cgx_2.10/src/Makefile
rename to cgx_2.11/src/Makefile
diff --git a/cgx_2.10/src/Makefile.inc b/cgx_2.11/src/Makefile.inc
similarity index 100%
rename from cgx_2.10/src/Makefile.inc
rename to cgx_2.11/src/Makefile.inc
diff --git a/cgx_2.10/src/XFunktions.c b/cgx_2.11/src/XFunktions.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/XFunktions.c
rename to cgx_2.11/src/XFunktions.c
diff --git a/cgx_2.10/src/adjustMidsideNode.c b/cgx_2.11/src/adjustMidsideNode.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/adjustMidsideNode.c
rename to cgx_2.11/src/adjustMidsideNode.c
diff --git a/cgx_2.10/src/badelems.c b/cgx_2.11/src/badelems.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/badelems.c
rename to cgx_2.11/src/badelems.c
diff --git a/cgx_2.10/src/bodyMesh2.c b/cgx_2.11/src/bodyMesh2.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/bodyMesh2.c
rename to cgx_2.11/src/bodyMesh2.c
diff --git a/cgx_2.10/src/bsort.c b/cgx_2.11/src/bsort.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/bsort.c
rename to cgx_2.11/src/bsort.c
diff --git a/cgx_2.10/src/bsortf.c b/cgx_2.11/src/bsortf.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/bsortf.c
rename to cgx_2.11/src/bsortf.c
diff --git a/cgx_2.10/src/bsorti.c b/cgx_2.11/src/bsorti.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/bsorti.c
rename to cgx_2.11/src/bsorti.c
diff --git a/cgx_2.10/src/calcNormalen.c b/cgx_2.11/src/calcNormalen.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/calcNormalen.c
rename to cgx_2.11/src/calcNormalen.c
diff --git a/cgx_2.10/src/calcPrinc.c b/cgx_2.11/src/calcPrinc.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/calcPrinc.c
rename to cgx_2.11/src/calcPrinc.c
diff --git a/cgx_2.10/src/calcPvector.c b/cgx_2.11/src/calcPvector.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/calcPvector.c
rename to cgx_2.11/src/calcPvector.c
diff --git a/cgx_2.10/src/calcWeight.c b/cgx_2.11/src/calcWeight.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/calcWeight.c
rename to cgx_2.11/src/calcWeight.c
diff --git a/cgx_2.10/src/cgx.c b/cgx_2.11/src/cgx.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/cgx.c
rename to cgx_2.11/src/cgx.c
index d9684ae..eb4be13
--- a/cgx_2.10/src/cgx.c
+++ b/cgx_2.11/src/cgx.c
@@ -24,7 +24,7 @@
#include <time.h>
#include <sys/utsname.h>
-#define VERSION "2.10.1"
+#define VERSION "2.11"
#define TEST 0
#define GLUT_WEEL_UP 3
@@ -1792,7 +1792,7 @@ void ConfigureAndShowWindow_Sequence( int dispFlag )
for(i=0; i<dsSequence.nds; i++)
{
- printf("ds[%d]:%d %s\n",i+1,dsSequence.ds[i]+1, lcase[dsSequence.ds[i]].name );
+ //printf("ds[%d]:%d %s\n",i+1,dsSequence.ds[i]+1, lcase[dsSequence.ds[i]].name );
/* check if the data of the specified lcase (Dataset) are already available */
if (!lcase[dsSequence.ds[i]].loaded)
@@ -1967,6 +1967,7 @@ void ConfigureAndShowWindow_Sequence( int dispFlag )
strcpy(lcase[lcase_animList].name,lcase[dsSequence.ds[0]].name);
strcpy(lcase[lcase_animList].dataset_text,lcase[dsSequence.ds[0]].dataset_text);
lcase[lcase_animList].step_number=lcase[anz->l-1].step_number+1;
+
glutDisplayFunc ( DrawMenuAnimate );
DrawMenuAnimate();
activWindow = w1;
@@ -2106,26 +2107,29 @@ void ConfigureAndShowWindow_Sequence( int dispFlag )
strcpy(lcase[lcase_animList].name,lcase[dsSequence.ds[0]].name);
strcpy(lcase[lcase_animList].dataset_text,lcase[dsSequence.ds[0]].dataset_text);
lcase[lcase_animList].step_number=lcase[anz->l-1].step_number+1;
+
+ // cur_lc needed in DrawMenuSequence to plot max/min value in legend
+ cur_lc=lcase_animList;
+ lcase[lcase_animList].value=0;
+ lcase[lcase_animList].max[0]=vmax;
+ lcase[lcase_animList].min[0]=vmin;
+ lcase[lcase_animList].nmax[0]=nmax;
+ lcase[lcase_animList].nmin[0]=nmin;
+
glutDisplayFunc ( DrawMenuSequence );
DrawMenuSequence();
activWindow = w1;
}
- lcase[lcase_animList].value=0;
- lcase[lcase_animList].max[0]=vmax;
- lcase[lcase_animList].min[0]=vmin;
- lcase[lcase_animList].nmax[0]=nmax;
- lcase[lcase_animList].nmin[0]=nmin;
+
for(n=0; n<lcase[lcase_animList].ncomps; n++)
{
lcase[lcase_animList].dat[n][0]=lcase[dsSequence.ds[n]].value;
}
- //cur_lc=lcase_animList; // not active because some functions need the original dataset and use cur_lc to find it (cut)
- cur_lc=dsSequence.ds[0];
- glutSetWindow( w1 );
- glShadeModel ( GL_FLAT );
- glutDisplayFunc ( DrawGraficSequence );
- DrawGraficSequence();
+ glutSetWindow( w1 );
+ glShadeModel ( GL_FLAT );
+ glutDisplayFunc ( DrawGraficSequence );
+ DrawGraficSequence();
}
diff --git a/cgx_2.10/src/cgx.h b/cgx_2.11/src/cgx.h
old mode 100644
new mode 100755
similarity index 98%
rename from cgx_2.10/src/cgx.h
rename to cgx_2.11/src/cgx.h
index 657e677..c75e183
--- a/cgx_2.10/src/cgx.h
+++ b/cgx_2.11/src/cgx.h
@@ -75,16 +75,16 @@ rendering is done in the index-mode.
#define HELPFILE {"/yaprod/yae55/Linux_x86_64/bin/cgx_doc/cgx.html",\
"/yaprod/yae55/Linux_x86_64/bin/ccx_doc/ccx.html"}
#else
- #define HELPFILE {"/yaprod/cae/application/CalculiX/doc/cgx_2.10/cgx.html",\
- "/yaprod/cae/application/CalculiX/doc/ccx_2.10/ccx.html"}
+ #define HELPFILE {"/yaprod/cae/application/CalculiX/doc/cgx_2.11/cgx.html",\
+ "/yaprod/cae/application/CalculiX/doc/ccx_2.11/ccx.html"}
#endif
#elif defined AFLIB
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html",\
- "/usr/local/CalculiX/cgx_2.10/doc/aflib/aflib.pdf"}
+ #define HELPFILE {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\
+ "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html",\
+ "/usr/local/CalculiX/cgx_2.11/doc/aflib/aflib.pdf"}
#else
- #define HELPFILE {"/usr/local/CalculiX/cgx_2.10/doc/cgx/cgx.html",\
- "/usr/local/CalculiX/ccx_2.10/doc/ccx/ccx.html"}
+ #define HELPFILE {"/usr/local/CalculiX/cgx_2.11/doc/cgx/cgx.html",\
+ "/usr/local/CalculiX/ccx_2.11/doc/ccx/ccx.html"}
#endif
/* html browser, change if necessary */
@@ -378,8 +378,8 @@ void bak_delBody( int anz, int *number );
void delBody( int anz, int *number );
int gbod_i( char *name, int blend, int anz_c, char *cori, int *corner );
int gbod( char *name, char *blend, int anz_c, char *cori, char *corner );
-void pre_gbod( char *record, int addFlag);
-void pre_body( char *record);
+int pre_gbod( char *record, int addFlag);
+int pre_body( char *record);
int nurl( char *string, int addFlag );
void delNurs( int anz, int *number );
int hashNurs( SumAsci *sumAsci, char *name, int nr);
diff --git a/cgx_2.10/src/checkIfNumber.c b/cgx_2.11/src/checkIfNumber.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/checkIfNumber.c
rename to cgx_2.11/src/checkIfNumber.c
diff --git a/cgx_2.10/src/compare.c b/cgx_2.11/src/compare.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/compare.c
rename to cgx_2.11/src/compare.c
diff --git a/cgx_2.10/src/compareStrings.c b/cgx_2.11/src/compareStrings.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/compareStrings.c
rename to cgx_2.11/src/compareStrings.c
diff --git a/cgx_2.10/src/contact.c b/cgx_2.11/src/contact.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/contact.c
rename to cgx_2.11/src/contact.c
diff --git a/cgx_2.10/src/copyEntity.c b/cgx_2.11/src/copyEntity.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/copyEntity.c
rename to cgx_2.11/src/copyEntity.c
index 9885d30..4b43b3d
--- a/cgx_2.10/src/copyEntity.c
+++ b/cgx_2.11/src/copyEntity.c
@@ -1608,7 +1608,7 @@ void pre_swep( char *record )
en[n]=dep_n[k][e_enqire[e].nod[n]];
en[n+ipuf]=dep_n[k+1][e_enqire[e].nod[n]];
}
- elem_define( anz->emax+1, 5-ipuf, &en[0], 1, 7 );
+ elem_define( anz->emax+1, 5-ipuf, &en[0], 1, 0 );
/* add to all sets were the orig is a member */
if(appendSetFlag) for(se=1; se<anz->sets; se++) if((se!=setNr)&&(se!=mastersetNr)&&(set[se].name!=(char *)NULL)&&(set[se].name[0]!='-')) if(!set[se].type) if( getIndex(&set[se].elem, set[se].anz_e, e) >-1) { seta( se, "e", anz->emax ); }
@@ -1618,7 +1618,7 @@ void pre_swep( char *record )
en[n]=e_enqire[e].nod[n];
en[n+ipuf]=dep_n[0][e_enqire[e].nod[n]];
}
- elem_define( e, 5-ipuf, &en[0], 0, 7 );
+ elem_define( e, 5-ipuf, &en[0], 0, 0 );
}
ipuf=0;
if (e_enqire[e].type == 8) ipuf = 6; /* TRI6 */
@@ -1825,6 +1825,10 @@ void pre_swep( char *record )
errMsg(" surf (%d) is undefined\n", set[setNr].surf[i] );
goto no_swep;
}
+
+ /* remove the now volume elements from the surface (once shells) */
+ surf[s[0]].ne=0;
+
s[1]=dep_s[set[setNr].surf[i]];
if (s[1]==-1)
{
diff --git a/cgx_2.10/src/corrad.c b/cgx_2.11/src/corrad.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/corrad.c
rename to cgx_2.11/src/corrad.c
diff --git a/cgx_2.10/src/dataGeo.c b/cgx_2.11/src/dataGeo.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/dataGeo.c
rename to cgx_2.11/src/dataGeo.c
diff --git a/cgx_2.10/src/dataMesh.c b/cgx_2.11/src/dataMesh.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/dataMesh.c
rename to cgx_2.11/src/dataMesh.c
index b342b12..1ab7ee0
--- a/cgx_2.10/src/dataMesh.c
+++ b/cgx_2.11/src/dataMesh.c
@@ -84,8 +84,10 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
{
register int i, j, l, n;
int comp, lcp, layers=0;
+ int stressFlag=-1;
double s[6], p[3], y[3], alfap[3][3];
double octaStress, vMises, dx,dy,dz, max_val=0., max_alfa=0., disp, alfa, dalfa, dalfa_grd=10., pi180;
+ double vMises_stresstostrain=2./3.;
char buffer[MAX_LINE_LENGTH];
pi180=PI/180.;
@@ -93,8 +95,12 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
/* in case stress-phases for shells are to be regarded its necessary how much layers exist. All STRESP must show up first */
if(( compare( lcase[lc].name, "STRESP", 6) == 6)&&(strlen(lcase[lc].name)==8)) layers=atoi(&lcase[lc].name[6])+1;
- if( (compare( lcase[lc].name, "STRESS", 6) == 6)||(compare( lcase[lc].name, "PSTRESS", 6) == 6)||(compare( lcase[lc].name, "STRAIN", 6) == 6)||( compare( lcase[lc].name, "TOSTRAIN", 6) == 6)||( compare( lcase[lc].name, "MESTRAIN", 6) == 6)||( compare( lcase[lc].name, "ELSTRAIN", 6) == 6)||( compare( lcase[lc].name, "ZZS", 3) == 3))
+ if( (compare( lcase[lc].name, "STRESS", 6) == 6)||(compare( lcase[lc].name, "PSTRESS", 6) == 6)||( compare( lcase[lc].name, "ZZS", 3) == 3)) stressFlag=1;
+
+ if( (compare( lcase[lc].name, "STRAIN", 6) == 6)||( compare( lcase[lc].name, "TOSTRAIN", 6) == 6)||( compare( lcase[lc].name, "MESTRAIN", 6) == 6)||( compare( lcase[lc].name, "ELSTRAIN", 6) == 6)||( compare( lcase[lc].name, "PLSTRAIN", 6) == 6)||( compare( lcase[lc].name, "CRSTRAIN", 6) == 6)||( compare( lcase[lc].name, "LE", 2) == 2)) stressFlag=0;
+
// if( lcase[lc].ictype[0] == 4) /* check first comp if its a tensor (STRESS) */
+ if(stressFlag!=-1)
{
/* check if the STRESS has six valid components */
if(lcase[lc].ncomps < 6 ) goto jumpStresses;
@@ -187,7 +193,8 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
s[5]=lcase[lc].dat[5][node[i].nr]* cos(alfa+pi180*lcase[lc].dat[11][node[i].nr]);
octaStress=
1./3. *sqrt( ((s[0]-s[1])*(s[0]-s[1])) +((s[1]-s[2])*(s[1]-s[2])) +((s[2]-s[0])*(s[2]-s[0])) +(6.*s[4]*s[4]) +(6.*s[5]*s[5]) +(6.*s[3]*s[3]) );
- vMises = (3./1.4142136) * octaStress;
+ vMises = (3./1.4142136) * octaStress;
+ if( stressFlag==0) vMises*=vMises_stresstostrain;
if(vMises>max_val) { max_val=vMises; max_alfa=alfa; }
/* if(node[i].nr==87) printf("1vMises[%d]:%f max_val:%f alfa:%f max_alfa=%f\n", l, vMises,max_val,alfa,max_alfa); */
}
@@ -207,6 +214,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
octaStress=
1./3. *sqrt( ((s[0]-s[1])*(s[0]-s[1])) +((s[1]-s[2])*(s[1]-s[2])) +((s[2]-s[0])*(s[2]-s[0])) +(6.*s[4]*s[4]) +(6.*s[5]*s[5]) +(6.*s[3]*s[3]) );
vMises = (3./1.4142136) * octaStress;
+ if( stressFlag==0) vMises*=vMises_stresstostrain;
if(vMises>max_val) max_val=vMises;
}
lcase[lc].dat[comp][node[i].nr]=max_val;
@@ -228,6 +236,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
octaStress=
1./3. *sqrt( ((s[0]-s[1])*(s[0]-s[1])) +((s[1]-s[2])*(s[1]-s[2])) +((s[2]-s[0])*(s[2]-s[0])) +(6.*s[4]*s[4]) +(6.*s[5]*s[5]) +(6.*s[3]*s[3]) );
vMises = (3./1.4142136) * octaStress;
+ if( stressFlag==0) vMises*=vMises_stresstostrain;
if(vMises>max_val) { max_val=vMises; max_alfa=alfa; }
/* if(node[i].nr==87) printf("1vMises[%d]:%f max_val:%f alfa:%f max_alfa=%f\n", l, vMises,max_val,alfa,max_alfa); */
}
@@ -247,6 +256,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
octaStress=
1./3. *sqrt( ((s[0]-s[1])*(s[0]-s[1])) +((s[1]-s[2])*(s[1]-s[2])) +((s[2]-s[0])*(s[2]-s[0])) +(6.*s[4]*s[4]) +(6.*s[5]*s[5]) +(6.*s[3]*s[3]) );
vMises = (3./1.4142136) * octaStress;
+ if( stressFlag==0) vMises*=vMises_stresstostrain;
if(vMises>max_val) max_val=vMises;
}
lcase[lc].dat[comp][node[i].nr]=max_val;
@@ -262,6 +272,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
octaStress=
1./3. *sqrt( ((s[0]-s[1])*(s[0]-s[1])) +((s[1]-s[2])*(s[1]-s[2])) +((s[2]-s[0])*(s[2]-s[0])) +(6.*s[4]*s[4]) +(6.*s[5]*s[5]) +(6.*s[3]*s[3]) );
vMises = (3./1.4142136) * octaStress;
+ if( stressFlag==0) vMises*=vMises_stresstostrain;
lcase[lc].dat[comp][node[i].nr] = vMises;
}
}
@@ -346,7 +357,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
/* calculate maximum Principal */
- if(compare( lcase[lc].name, "STRESS", 6) == 6)
+ if(stressFlag==1)
{
strcpy ( lcase[lc].compName[comp+2], "PS1x ");
strcpy ( lcase[lc].compName[comp+3], "PS1y ");
@@ -367,7 +378,7 @@ void calcDatasets( int lc, Summen *anz, Nodes *node, Datasets *lcase )
strcpy ( lcase[lc].compName[comp+18], "maxShear");
strcpy ( lcase[lc].compName[comp+19], "Snorm ");
}
- else if((compare( lcase[lc].name, "STRAIN", 6) == 6)||( compare( lcase[lc].name, "TOSTRAIN", 6) == 6)||( compare( lcase[lc].name, "MESTRAIN", 6) == 6)||( compare( lcase[lc].name, "ELSTRAIN", 6) == 6))
+ else if(stressFlag==0)
{
strcpy ( lcase[lc].compName[comp+2], "PE1x ");
strcpy ( lcase[lc].compName[comp+3], "PE1y ");
diff --git a/cgx_2.10/src/defineEntity.c b/cgx_2.11/src/defineEntity.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/defineEntity.c
rename to cgx_2.11/src/defineEntity.c
index 05bb902..a3680b3
--- a/cgx_2.10/src/defineEntity.c
+++ b/cgx_2.11/src/defineEntity.c
@@ -1282,6 +1282,7 @@ void pre_shape( char *record, int addFlag)
printf ("ERROR: radius %f of Shape %s not valid\n", r1, name);
return;
}
+ r1/=scale->w;
/* generate a third point perpendicular to the axis at a distant of r1 */
v_result( &point[p1].px, &point[p2].px, p1p2 );
@@ -1331,6 +1332,8 @@ void pre_shape( char *record, int addFlag)
printf ("ERROR: radius2 %f of Shape %s not valid\n", r2, name);
return;
}
+ r1/=scale->w;
+ r2/=scale->w;
/* generate a third point perpendicular to the axis at a distant of r1 */
v_result( &point[p1].px, &point[p2].px, p1p2 );
@@ -3632,7 +3635,7 @@ int getBodyParameters( char *record, char *name, char *ori, char ***cori, char
-void pre_gbod( char *record, int addFlag)
+int pre_gbod( char *record, int addFlag)
{
int anz_c, i;
char name[MAX_LINE_LENGTH], ori[MAX_LINE_LENGTH];
@@ -3665,16 +3668,16 @@ void pre_gbod( char *record, int addFlag)
else
{
printf("ERROR: Orientation:%s of body:%s not recognized\n", cori[i], edge[i] );
- return;
+ return(-1);
}
}
if(printFlag) printf("\n");
/* alle ori und surfs umspeichern */
coris=(char *)calloc((int)(anz_c*2), sizeof(char));
- if(coris==NULL) { printf("ERROR: realloc failed in pre_gsur()\n"); return; }
+ if(coris==NULL) { printf("ERROR: realloc failed in pre_gsur()\n"); return(-1); }
edges=(char *)calloc((int)(anz_c*MAX_LINE_LENGTH), sizeof(char));
- if(edges==NULL) { printf("ERROR: realloc failed in pre_gsur()\n"); return; }
+ if(edges==NULL) { printf("ERROR: realloc failed in pre_gsur()\n"); return(-1); }
for(i=0; i<anz_c; i++)
{
coris[i*2]= cori[i][0];
@@ -3690,10 +3693,11 @@ void pre_gbod( char *record, int addFlag)
if( i <0)
printf("ERROR: body could not be created\n");
+ return(i);
}
-void pre_body( char *record)
+int pre_body( char *record)
{
int length, anz_c, i, se;
static char name[MAX_LINE_LENGTH], ori[MAX_LINE_LENGTH], cori[7][2], edge[7][MAX_LINE_LENGTH], buffer[MAX_LINE_LENGTH];
@@ -3725,7 +3729,7 @@ void pre_body( char *record)
operateAlias( edge[1], "s " );
i=body_( name, &edge[0][0] );
if( i <0)
- { printf("ERROR: body could not be created\n"); return; }
+ printf("ERROR: body could not be created\n");
}
else if(anz_c==1)
{
@@ -3744,21 +3748,21 @@ void pre_body( char *record)
sprintf(&dummy[strlen(dummy)]," + %s", surf[set[se].surf[i]].name);
}
- pre_gbod( dummy, 0 );
+ i=pre_gbod( dummy, 0 );
free(dummy);
- return;
}
else
{
printf("ERROR: surface could not be created, set:%s unknown\n",edge[0]);
- return;
+ return(-1);
}
}
else
{
printf("ERROR: body could not be created\n");
- return;
+ return(-1);
}
+ return(i);
}
diff --git a/cgx_2.10/src/dispLists.c b/cgx_2.11/src/dispLists.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/dispLists.c
rename to cgx_2.11/src/dispLists.c
diff --git a/cgx_2.10/src/elemChecker.c b/cgx_2.11/src/elemChecker.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/elemChecker.c
rename to cgx_2.11/src/elemChecker.c
diff --git a/cgx_2.10/src/extFunktions.c b/cgx_2.11/src/extFunktions.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/extFunktions.c
rename to cgx_2.11/src/extFunktions.c
index 84d3ffb..7788ffd
--- a/cgx_2.10/src/extFunktions.c
+++ b/cgx_2.11/src/extFunktions.c
@@ -159,13 +159,14 @@ void help( void )
printf (" 'div' [] | [<line> <div>] | [<set> ['auto' <node-dist> <angle> <elem-ratio>]|[<div>]|['mult'|'div' <factor-div> [<factor-bias>]]]\n");
printf (" 'ds' <1.Dataset-Nr|l|negative-ds> <2.Dataset-Nr|l|negative-ds> <3.Dataset-Nr|l|negative-ds> ['a[h]' [<entity-nr>]]|['e[h]' <entity-nr> (up to 4 for vector-plots)]|['o' <offset> [<entity-nr>]]|['s' <factor>]\n");
printf (" 'elem' <nr> <firstNode>-<lastNode> 'be2'|'be3'|'tr3'|'tr6'|'qu4'|'qu8'|'he8'|'he20'\n");
- printf (" 'elty' [] | [<set> 'be2'|'be2d'|'be3'|'tr3'|'tr3u'|'tr3e'|'tr3s'|'tr3c'|'tr6'|'tr6u'|'tr6e'|'tr6s'|'tr6c'|'qu4'|'qu4e'|'qu4s'|'qu4c'|'qu8'|'qu8e'|'qu8s'|'qu8c'|'he8'|'he8f'|'he8i'|'he8r'|'he20'|'he20r'|'te4'|'te10' [<parameter>]]\n");
+ printf (" 'elty' [] | [<set> 'be2'|'be2f'|'be2d'|'be3'|'be3f'|'tr3'|'tr3u'|'tr3e'|'tr3s'|'tr3c'|'tr6'|'tr6u'|'tr6e'|'tr6s'|'tr6c'|'qu4'|'qu4e'|'qu4s'|'qu4c'|'qu8'|'qu8e'|'qu8s'|'qu8c'|'he8'|'he8f'|'he8i'|'he8r'|'he20'|'he20r'|'te4'|'te4f'|'te10'|'pe6'|'pe6f'|'pe6i'|'pe15'|'pe15r' [<parameter>]]\n");
printf (" 'else'\n");
printf (" 'eqal' 'jbir'|'aspr'|'mca' <value>\n");
printf (" 'endif'\n");
printf (" 'endwhile'\n");
printf (" 'enq' <set> <set> ['set' name]|'rec' <value>|'_' <value>|'_' <value>|'_']|['cyl' 'x'|'y'|'z' <value>|'_' <value>|'_'] <tolvalue> 'i'|'a'|'h'|'l' [value]\n");
printf (" 'exit' \n");
+ printf (" 'fil' <line> <line> <radius>\n");
printf (" 'flip' <setname> | [ <surf> ['auto'] ]\n");
printf (" 'flpc' \n");
printf (" 'font' 'd'|'l' <value(1-6)> \n");
@@ -174,18 +175,20 @@ void help( void )
printf (" 'glue' <set> <tol> ['equ']\n");
printf (" 'gonly' 'on'|'off' \n");
printf (" 'graph' [<amplitude|*chars*> 'amp' [<l>]]|[<material|*chars*> 'mat' [<l>]]|[<set>|'-p' ['length' ['+'|'-']]|['step'|'nr'|'time'|'descr'|<parameter> [<dataset> <entity|parameter> [<first-Dataset-Nr> [<last-Dataset-Nr>]] ] ] ] \n");
+ printf (" 'grpa' <grpNr> <set>\n");
printf (" 'grps' \n");
printf (" 'gsur' <name|!> '+|-' 'BLEND|<nurbs>' ['+|-' <line|lcmb>] .. (3-5 lines) \n");
printf (" 'gtol' <geometric-tol> \n");
printf (" 'help' \n");
printf (" 'hcpy' ['ps'|'xwd'|'gif'|'png']|[make [ls]]|[clean] (def:xwd)\n");
printf (" 'if' <value> 'eq'|'ne'|'=='|'!='|'<'|'>' <value>\n");
+ printf (" 'int' <line> <line>\n");
printf (" 'lcmb' <name|!> ['+|-' <line> '+|-' <line> ..(up to 14 lines)]|['ADD' '+|-' <line> '+|-' <line>..(up to 14 lines)] \n");
printf (" 'length' <set>\n");
printf (" 'line' <name|!> <p1> <p2> <cp|seq> <div> [<bias>]\n");
printf (" 'lnor' <name|!> <p1> <p2> <p3> <length>\n");
printf (" 'map' <slave-set> <master-set> ['volu' 'ds'[<nr>] ]|['surf' 'ds'[<nr>] ]|[ 'x'|'y'|'z'|'rx'|'ry'|'rz' 'ds'[<nr>] ] \n");
- printf (" 'mata' <matNr> <set> \n");
+ printf (" 'mata' <matNr> <set>\n");
printf (" 'mats' \n");
printf (" 'max' <value> ['f'|'i'|'e'] ['l'|'u']\n");
printf (" 'merg' 'n'|'e'|'p'|'l'|'c'|'s' <set> <gtol> 'nolock' \n");
@@ -238,7 +241,7 @@ void help( void )
printf (" 'rot' ['u'|'d'|'r'|'l'|'c' <angle>]|['x'|'-x'|'y'|'-y'|'z'|'-z']\n");
printf (" 'save' \n");
printf (" 'scal' ['s'|'v'|'d'] [<value>]\n");
- printf (" 'send' <set> ['abq'|'adh'|'ans'|'ast'|'bp'|'dar'|'duns'|'fbd'|'frd(m)'|'gmp'|'lst'|'nas'|'ng'|'pat'|'seq'|'stl'|'tcg'] [<RETURN>]|['c'|'e']|['bin']|['comp']|['quadlin']|['names']|['nor']|[ ['spc'|'spcf`] [<1-6|t|p> [<value>|['f' <value>]]|['ds'<nr>['+'] e<nr>]]|['nor' <fac1> [<fac2> <fac3>]]|['slide'|'slidef' 'c'|'s'|'rx'|'ry'|'rz'|'tx'|'ty'|'tz']]|['sur' [+|-]]|['pres' [<value>]|['ds'<nr> 'e'<nr>] [+|-]]|['force' <f1> <f2> <f3> ]|['film' [[<nodenr>]|[<temp>]|[['ds'<nr>]|[s [...]
+ printf (" 'send' <set> ['abq'|'adh'|'ans'|'ast'|'bp'|'dar'|'duns'|'fbd'|'frd(m)'|'gmp'|'lst'|'nas'|'ng'|'pat'|'seq'|'stl'|'tcg'] [<RETURN>]|['c'|'e']|['bin']|['comp']|['quadlin']|['names']|['nor']|[ ['spc'|'spcf`] [<1-6|t|p> [<value>|['f' <value>]]|['ds'<nr>['+'] e<nr>]]|['nor' <fac1> [<fac2> <fac3>]]|['slide'|'slidef' 'c'|'s'|'rx'|'ry'|'rz'|'tx'|'ty'|'tz']]|['sur' [+|-]]|['pres' [<value>]|['ds'<nr> 'e'<nr>] [+|-]]|['force' <f1> <f2> <f3> ]|['film' [[<nodenr>]|[<temp>]|[['ds'<nr>]|[s [...]
printf (" OR 'send' <dep-set> <indep-set> 'nas'|'abq'|'ans'|'ids' ['cycmpc'|'cycmpcf' 'px'|'py'|'pz'|'tx'|'ty'|'tz'|'rx'|'ry'|'rz'|'cx'|'cy'|'cz'<segments> 'c'|'u'<NR>]|['areampc' [<1-6|t|p>|<1|2|3,px,py,pz,vx,vy,vz> 'c'|'u'<Nr>|'f'<value>|['slide']|['presfit' ['s'<value>]]]|['gap' <vx> <vy> <vz> <tol> ]\n");
printf (" OR 'send' <set> 'foam' [<base-type> <set>]|['cyclic' <set> <set> 'rx'|'ry'|'rz'|'cx'|'cy'|'cz'|<vx,vy,vz>] \n");
printf (" OR 'send' <set> 'isaac' [<base-type> <set>] \n");
diff --git a/cgx_2.10/src/extGL.c b/cgx_2.11/src/extGL.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/extGL.c
rename to cgx_2.11/src/extGL.c
diff --git a/cgx_2.10/src/extUtil.h b/cgx_2.11/src/extUtil.h
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/extUtil.h
rename to cgx_2.11/src/extUtil.h
diff --git a/cgx_2.10/src/fillBody2.c b/cgx_2.11/src/fillBody2.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/fillBody2.c
rename to cgx_2.11/src/fillBody2.c
diff --git a/cgx_2.10/src/foamFaces.c b/cgx_2.11/src/foamFaces.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/foamFaces.c
rename to cgx_2.11/src/foamFaces.c
diff --git a/cgx_2.10/src/frecord.c b/cgx_2.11/src/frecord.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/frecord.c
rename to cgx_2.11/src/frecord.c
diff --git a/cgx_2.10/src/fuss.c b/cgx_2.11/src/fuss.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/fuss.c
rename to cgx_2.11/src/fuss.c
diff --git a/cgx_2.10/src/generateTet.cpp b/cgx_2.11/src/generateTet.cpp
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/generateTet.cpp
rename to cgx_2.11/src/generateTet.cpp
diff --git a/cgx_2.10/src/getGeoDataTria.c b/cgx_2.11/src/getGeoDataTria.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/getGeoDataTria.c
rename to cgx_2.11/src/getGeoDataTria.c
diff --git a/cgx_2.10/src/gl3grades.c b/cgx_2.11/src/gl3grades.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/gl3grades.c
rename to cgx_2.11/src/gl3grades.c
diff --git a/cgx_2.10/src/graph.c b/cgx_2.11/src/graph.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/graph.c
rename to cgx_2.11/src/graph.c
diff --git a/cgx_2.10/src/ifind.c b/cgx_2.11/src/ifind.c
old mode 100644
new mode 100755
similarity index 94%
rename from cgx_2.10/src/ifind.c
rename to cgx_2.11/src/ifind.c
index 1dd889f..3c089b7
--- a/cgx_2.10/src/ifind.c
+++ b/cgx_2.11/src/ifind.c
@@ -14,9 +14,15 @@ int ifind(int **ipnt, int n, int x0 )
printf("a:%d\n", *ipnt);
#endif
+ if(n<1)
+ {
+ /* no array */
+ return(-3);
+ }
+
x=*ipnt;
/* if x0 is lower than the first elem */
- if((n==0)||(x0<x[0]))
+ if(x0<x[0])
{
/* is no member of array */
return(-1);
diff --git a/cgx_2.10/src/iinsert.c b/cgx_2.11/src/iinsert.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/iinsert.c
rename to cgx_2.11/src/iinsert.c
diff --git a/cgx_2.10/src/improveBadTr3.c b/cgx_2.11/src/improveBadTr3.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/improveBadTr3.c
rename to cgx_2.11/src/improveBadTr3.c
diff --git a/cgx_2.10/src/improveMesh.c b/cgx_2.11/src/improveMesh.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/improveMesh.c
rename to cgx_2.11/src/improveMesh.c
diff --git a/cgx_2.10/src/iniMeshData.c b/cgx_2.11/src/iniMeshData.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/iniMeshData.c
rename to cgx_2.11/src/iniMeshData.c
index b608dac..10380d6
--- a/cgx_2.10/src/iniMeshData.c
+++ b/cgx_2.11/src/iniMeshData.c
@@ -1169,15 +1169,18 @@ void iniMeshData( char *datin, char *format )
for (j=0; j<set[i].anz_elf; j++)
{
/* store the actual face-indexes in the referenced sets */
+ /*
if(face[set[i].elf[j].e].indx[set[i].elf[j].f]==-1)
{
printf(" ERROR in set:%s, face:%d of element:%d does not exist.\n",set[i].name, set[i].elf[j].f+1, set[i].elf[j].e);
}
else
+ */
{
e=set[i].elf[j].e;
if((e_enqire[e].type>6)&&(e_enqire[e].type<11))
{
+ //printf("e_enqire[%d].attr:%d f:%d\n", e,e_enqire[e].attr, set[i].elf[j].f);
if(e_enqire[e].attr>3)
{
set[i].elf[j].f++;
diff --git a/cgx_2.10/src/intpol.c b/cgx_2.11/src/intpol.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/intpol.c
rename to cgx_2.11/src/intpol.c
diff --git a/cgx_2.10/src/intpol2.c b/cgx_2.11/src/intpol2.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/intpol2.c
rename to cgx_2.11/src/intpol2.c
diff --git a/cgx_2.10/src/intpol3.c b/cgx_2.11/src/intpol3.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/intpol3.c
rename to cgx_2.11/src/intpol3.c
diff --git a/cgx_2.10/src/iremove.c b/cgx_2.11/src/iremove.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/iremove.c
rename to cgx_2.11/src/iremove.c
diff --git a/cgx_2.10/src/linelength.c b/cgx_2.11/src/linelength.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/linelength.c
rename to cgx_2.11/src/linelength.c
diff --git a/cgx_2.10/src/m_copy.c b/cgx_2.11/src/m_copy.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/m_copy.c
rename to cgx_2.11/src/m_copy.c
diff --git a/cgx_2.10/src/m_prod.c b/cgx_2.11/src/m_prod.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/m_prod.c
rename to cgx_2.11/src/m_prod.c
diff --git a/cgx_2.10/src/m_prodtr.c b/cgx_2.11/src/m_prodtr.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/m_prodtr.c
rename to cgx_2.11/src/m_prodtr.c
diff --git a/cgx_2.10/src/m_sub.c b/cgx_2.11/src/m_sub.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/m_sub.c
rename to cgx_2.11/src/m_sub.c
diff --git a/cgx_2.10/src/makeTriFromElems.c b/cgx_2.11/src/makeTriFromElems.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/makeTriFromElems.c
rename to cgx_2.11/src/makeTriFromElems.c
diff --git a/cgx_2.10/src/mergEntity.c b/cgx_2.11/src/mergEntity.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/mergEntity.c
rename to cgx_2.11/src/mergEntity.c
diff --git a/cgx_2.10/src/mesh2d.c b/cgx_2.11/src/mesh2d.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/mesh2d.c
rename to cgx_2.11/src/mesh2d.c
diff --git a/cgx_2.10/src/meshSet.c b/cgx_2.11/src/meshSet.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/meshSet.c
rename to cgx_2.11/src/meshSet.c
diff --git a/cgx_2.10/src/meshSurf.c b/cgx_2.11/src/meshSurf.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/meshSurf.c
rename to cgx_2.11/src/meshSurf.c
diff --git a/cgx_2.10/src/messages.c b/cgx_2.11/src/messages.c
similarity index 100%
rename from cgx_2.10/src/messages.c
rename to cgx_2.11/src/messages.c
diff --git a/cgx_2.10/src/near3d.c b/cgx_2.11/src/near3d.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/near3d.c
rename to cgx_2.11/src/near3d.c
diff --git a/cgx_2.10/src/nurbl2seq.c b/cgx_2.11/src/nurbl2seq.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/nurbl2seq.c
rename to cgx_2.11/src/nurbl2seq.c
diff --git a/cgx_2.10/src/orient.c b/cgx_2.11/src/orient.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/orient.c
rename to cgx_2.11/src/orient.c
diff --git a/cgx_2.10/src/p_angle.c b/cgx_2.11/src/p_angle.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/p_angle.c
rename to cgx_2.11/src/p_angle.c
diff --git a/cgx_2.10/src/parser.c b/cgx_2.11/src/parser.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/parser.c
rename to cgx_2.11/src/parser.c
diff --git a/cgx_2.10/src/pickFunktions.c b/cgx_2.11/src/pickFunktions.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/pickFunktions.c
rename to cgx_2.11/src/pickFunktions.c
index 6110ae1..a3c8eee
--- a/cgx_2.10/src/pickFunktions.c
+++ b/cgx_2.11/src/pickFunktions.c
@@ -4681,14 +4681,15 @@ int createFillet(int lin, double filletRadius)
for(i=0; i<2; i++)
{
/* check if the split-point is outside */
- if(printFlag) printf("check line[%d]:%s\n", i,line[linbuf[i]].name);
+ if(printFlag) printf("check line[%d]:%s of type:%c\n", i,line[linbuf[i]].name, line[linbuf[i]].typ);
if(line[linbuf[i]].typ!='s') continue;
/* restore the division */
line[linbuf[i]].div=divbuffer[i];
repLine(linbuf[i]);
- if(!breakflag) if((lp1ps[i]<=0)||(lp1ps[i]>=lp1p2[i])) continue;
+ //printf("check line[%d]:%s of type:%c br:%d %f %f\n", i,line[linbuf[i]].name, line[linbuf[i]].typ, breakflag, lp1ps[i], lp1p2[i]);
+ //if(!breakflag) if((lp1ps[i]<=0)||(lp1ps[i]>=lp1p2[i])) continue;
if(printFlag) printf("redefine the trkset of line[%d]:%s\n", i,line[linbuf[i]].name);
@@ -4724,6 +4725,7 @@ int createFillet(int lin, double filletRadius)
{
v_result( &point[set[trk].pnt[j]].px, &point[set[trk].pnt[j+1]].px, p1p2 );
lbez+=v_betrag( p1p2 );
+ //printf("p %s %s lbez:%f lps[i]:%f\n", point[set[trk].pnt[j]].name,point[set[trk].pnt[j+1]].name, lbez, lps[i]);
if(lbez<lps[i]) seta( trkNew, "ps", set[trk].pnt[j+1] );
else break;
}
@@ -5735,7 +5737,7 @@ void updLcase(int lc, int setNr)
{
if((compare(lcase[i].name, buffer[j], 5)==5)&&(lcase[i].ictype[0]!= 12))
{
- printf("lcase[i].name:%s lcase[lc].name:%s compareChars:%d\n", lcase[i].name,lcase[lc].name,compareChars);
+ //printf("lcase[i].name:%s lcase[lc].name:%s compareChars:%d\n", lcase[i].name,lcase[lc].name,compareChars);
lc=i;
goto next_lc;
}
diff --git a/cgx_2.10/src/plotFunktions.c b/cgx_2.11/src/plotFunktions.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/plotFunktions.c
rename to cgx_2.11/src/plotFunktions.c
diff --git a/cgx_2.10/src/readDuns.c b/cgx_2.11/src/readDuns.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readDuns.c
rename to cgx_2.11/src/readDuns.c
diff --git a/cgx_2.10/src/readEdges.c b/cgx_2.11/src/readEdges.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readEdges.c
rename to cgx_2.11/src/readEdges.c
diff --git a/cgx_2.10/src/readFoam.c b/cgx_2.11/src/readFoam.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readFoam.c
rename to cgx_2.11/src/readFoam.c
diff --git a/cgx_2.10/src/readIsaac.c b/cgx_2.11/src/readIsaac.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readIsaac.c
rename to cgx_2.11/src/readIsaac.c
diff --git a/cgx_2.10/src/readNG.c b/cgx_2.11/src/readNG.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readNG.c
rename to cgx_2.11/src/readNG.c
diff --git a/cgx_2.10/src/readNastran.c b/cgx_2.11/src/readNastran.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readNastran.c
rename to cgx_2.11/src/readNastran.c
diff --git a/cgx_2.10/src/readStdCmap.c b/cgx_2.11/src/readStdCmap.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readStdCmap.c
rename to cgx_2.11/src/readStdCmap.c
diff --git a/cgx_2.10/src/readStl.c b/cgx_2.11/src/readStl.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readStl.c
rename to cgx_2.11/src/readStl.c
diff --git a/cgx_2.10/src/readWf.c b/cgx_2.11/src/readWf.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readWf.c
rename to cgx_2.11/src/readWf.c
diff --git a/cgx_2.10/src/readccx.c b/cgx_2.11/src/readccx.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/readccx.c
rename to cgx_2.11/src/readccx.c
index 5ff5e61..afd5c62
--- a/cgx_2.10/src/readccx.c
+++ b/cgx_2.11/src/readccx.c
@@ -4300,9 +4300,10 @@ int getDload(char *rec_str)
crecord(rec_str, dat);
/* check if it is a face load */
- if(toupper(dat[1][0])=='P')
+ if((toupper(dat[1][0])=='P')||(toupper(dat[1][0])=='E'))
{
- face=(int)atoi(&dat[1][1])-1;
+ if(toupper(dat[1][0])=='E') face=(int)atoi(&dat[1][5])+1;
+ else face=(int)atoi(&dat[1][1])-1;
eset=getSetNrx(dat[0]);
if (eset>-1) sum_e=setx[eset].anz_e;
@@ -4548,7 +4549,7 @@ int getMassflow(char *rec_str)
crecord(rec_str, dat);
/* check if it is a face load */
- if(toupper(dat[1][0])=='S')
+ if(toupper(dat[1][0])=='M')
{
face=(int)atoi(&dat[1][1])-1;
diff --git a/cgx_2.10/src/readfrd.c b/cgx_2.11/src/readfrd.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readfrd.c
rename to cgx_2.11/src/readfrd.c
diff --git a/cgx_2.10/src/readstep.c b/cgx_2.11/src/readstep.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/readstep.c
rename to cgx_2.11/src/readstep.c
diff --git a/cgx_2.10/src/rectcyl.c b/cgx_2.11/src/rectcyl.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/rectcyl.c
rename to cgx_2.11/src/rectcyl.c
diff --git a/cgx_2.10/src/renumberfrd.c b/cgx_2.11/src/renumberfrd.c
old mode 100644
new mode 100755
similarity index 92%
rename from cgx_2.10/src/renumberfrd.c
rename to cgx_2.11/src/renumberfrd.c
index 685b61c..4f74bc1
--- a/cgx_2.10/src/renumberfrd.c
+++ b/cgx_2.11/src/renumberfrd.c
@@ -87,6 +87,15 @@ int renumberfrd( int firstelem, int firstnode, Summen *anz, Nodes **nptr, Elemen
{
for (nlc=0; nlc< anz->l; nlc++)
{
+ /* check if the data of the specified lcase (Dataset) are already available */
+ if (!lcase[nlc].loaded)
+ {
+ if( readfrdblock(nlc, anz, node, lcase )==-1)
+ {
+ printf("ERROR: Could not read data for Dataset:%d\n", nlc+1);
+ return(-1);
+ }
+ }
for (ncmp=0; ncmp<lcase[nlc].ncomps; ncmp++ )
{
for (i=0; i<anz->n; i++)
@@ -96,7 +105,7 @@ int renumberfrd( int firstelem, int firstnode, Summen *anz, Nodes **nptr, Elemen
if ( (lcase[nlc].dat[ncmp] = (float *)realloc( (float *)lcase[nlc].dat[ncmp] ,(anz->nmax+1) * sizeof(float))) == NULL )
{
printf("\n\n ERROR: realloc failed\n\n" );
- exit(-1);
+ return(-1);
}
for (i=0; i<=anz->nmax; i++)
{
@@ -116,7 +125,7 @@ int renumberfrd( int firstelem, int firstnode, Summen *anz, Nodes **nptr, Elemen
if ( (node = (Nodes *)realloc((Nodes *)node, (anz->nmax+1) * sizeof(Nodes))) == NULL )
{
printf("\n\n ERROR: realloc failed, nodenr\n") ;
- exit(-1);
+ return(-1);
}
node[newnode[node[i].nr]].nx=newnode_x[node[i].nr];
node[newnode[node[i].nr]].ny=newnode_y[node[i].nr];
diff --git a/cgx_2.10/src/selectDisplayFaces.c b/cgx_2.11/src/selectDisplayFaces.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/selectDisplayFaces.c
rename to cgx_2.11/src/selectDisplayFaces.c
diff --git a/cgx_2.10/src/sendMpc.c b/cgx_2.11/src/sendMpc.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/sendMpc.c
rename to cgx_2.11/src/sendMpc.c
diff --git a/cgx_2.10/src/sendSet.c b/cgx_2.11/src/sendSet.c
old mode 100644
new mode 100755
similarity index 95%
rename from cgx_2.10/src/sendSet.c
rename to cgx_2.11/src/sendSet.c
index 63f2be2..27b5d40
--- a/cgx_2.10/src/sendSet.c
+++ b/cgx_2.11/src/sendSet.c
@@ -1688,31 +1688,33 @@ void sendPressure( char *setname, char *format, Summen *anz, Nodes *node, Elemen
{
if(e_enqire[face[i].elem_nr].type>10) // beam
{
- if(val4) fprintf( handle, "%d, S?, %s,, %lf \n", face[i].elem_nr, val4, pressure[j]);
- else fprintf( handle, "%d, P?, %lf \n", face[i].elem_nr, pressure[j]);
+ if(val4) fprintf( handle, "%d, S?, %s,, %e \n", face[i].elem_nr, val4, pressure[j]);
+ else fprintf( handle, "%d, P?, %e \n", face[i].elem_nr, pressure[j]);
}
else if(e_enqire[face[i].elem_nr].attr>3) // plain strain,stress or axissym
{
/* only the surrounding faces are applicable */
- if(val4) fprintf( handle, "%d, S%d, %s,, %lf\n", face[i].elem_nr, face[i].nr-1, val4, pressure[j]);
- else fprintf( handle, "%d, P%d, %lf\n", face[i].elem_nr, face[i].nr-1, pressure[j]);
+ if(val4) fprintf( handle, "%d, S%d, %s,, %e\n", face[i].elem_nr, face[i].nr-1, val4, pressure[j]);
+ else fprintf( handle, "%d, P%d, %e\n", face[i].elem_nr, face[i].nr-1, pressure[j]);
}
else
{
if(face[i].nr==1)
{
- if(val4) fprintf( handle, "%d, S, %s,, %lf\n", face[i].elem_nr, val4, pressure[j]);
- else fprintf( handle, "%d, P, %lf\n", face[i].elem_nr, pressure[j]);
+ if(val4) fprintf( handle, "%d, S, %s,, %e\n", face[i].elem_nr, val4, pressure[j]);
+ else fprintf( handle, "%d, P, %e\n", face[i].elem_nr, pressure[j]);
+ }
+ else
+ {
+ if(val4) fprintf( handle, "%d, EDNOR%d, %s,,%e\n", face[i].elem_nr, face[i].nr-1, val4, pressure[j]);
+ else fprintf( handle, "%d, EDNOR%d, %e\n", face[i].elem_nr, face[i].nr-1, pressure[j]);
}
- /* the surrounding faces are not applicable */
- //else fprintf( handle, "%d, P%d, %lf\n", face[i].elem_nr, face[i].nr+1, pressure[j]);
- //else fprintf( handle, "** elem %d is a shell, loading on P%d is not permitted (see ccx manual)\n", face[i].elem_nr, face[i].nr+1);
}
}
else
{
- if(val4) fprintf( handle, "%d, S%d, %s,, %lf\n", face[i].elem_nr, face[i].nr+1, val4, pressure[j]);
- else fprintf( handle, "%d, P%d, %lf\n", face[i].elem_nr, face[i].nr+1, pressure[j]);
+ if(val4) fprintf( handle, "%d, S%d, %s,, %e\n", face[i].elem_nr, face[i].nr+1, val4, pressure[j]);
+ else fprintf( handle, "%d, P%d, %e\n", face[i].elem_nr, face[i].nr+1, pressure[j]);
}
}
fclose(handle);
@@ -1728,22 +1730,22 @@ void sendPressure( char *setname, char *format, Summen *anz, Nodes *node, Elemen
{
i=set[setNr].face[j];
if (face[i].nr==0)
- fprintf(handle, "SFE, %d, 1, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 1, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else if (face[i].nr==1)
- fprintf(handle, "SFE, %d, 6, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 6, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else if (face[i].nr==2)
- fprintf(handle, "SFE, %d, 2, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 2, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else if (face[i].nr==3)
- fprintf(handle, "SFE, %d, 3, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 3, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else if (face[i].nr==4)
- fprintf(handle, "SFE, %d, 4, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 4, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else if (face[i].nr==5)
- fprintf(handle, "SFE, %d, 5, PRES, ,%lf \n",
+ fprintf(handle, "SFE, %d, 5, PRES, ,%e \n",
face[i].elem_nr, pressure[j] );
else
printf(" Not supported for this element type\n");
@@ -2183,6 +2185,7 @@ void sendRadiate( char *setname, char *format, Summen *anz, Nodes *node, Element
int setNr;
int i,j;
char prognam[MAX_LINE_LENGTH];
+ char faceExtention[MAX_LINE_LENGTH];
double *temp, *emisivity;
FILE *handle;
int n, lc, entity;
@@ -2195,6 +2198,7 @@ void sendRadiate( char *setname, char *format, Summen *anz, Nodes *node, Element
return;
}
+ faceExtention[0]=0;
if( ((val1!=NULL)&&(val1[0]=='-'))||((val2!=NULL)&&(val2[0]=='-'))||((val3!=NULL)&&(val3[0]=='-'))||((val4!=NULL)&&(val4[0]=='-'))||((val5!=NULL)&&(val5[0]=='-')) ) orif=0;
if((compare(val1, "ds", 2)==2)&&(compare(val3, "ds", 2)==2)) sprintf(prognam,"%s_%s%s%s%s.rad",setname,val1,val2,val3,val4);
@@ -2250,6 +2254,11 @@ void sendRadiate( char *setname, char *format, Summen *anz, Nodes *node, Element
}
}
}
+ else if(compare(val1, "cr", 2)==2)
+ {
+ strcpy(faceExtention,"CR");
+ for (j=0; j<set[setNr].anz_f; j++ ) temp[j]=atof(&val1[2]);
+ }
else
{
for (j=0; j<set[setNr].anz_f; j++ ) temp[j]=atof(val1);
@@ -2318,22 +2327,18 @@ void sendRadiate( char *setname, char *format, Summen *anz, Nodes *node, Element
fprintf( handle, "%d, R?, %lf, %e \n", face[i].elem_nr, temp[j], emisivity[j]);
else if(e_enqire[face[i].elem_nr].attr>3) // plain strain,stress or axissym
{
- //if(face[i].nr==0) fprintf( handle, "%d, RN, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- //else if(face[i].nr==1) fprintf( handle, "%d, RP, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, RP, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, RN, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- else fprintf( handle, "%d, R%d, %lf, %e\n", face[i].elem_nr, face[i].nr-1, temp[j], emisivity[j]);
+ if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, RP%s, %lf, %e\n", face[i].elem_nr, faceExtention, temp[j], emisivity[j]);
+ else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, RN%s, %lf, %e\n", face[i].elem_nr, faceExtention, temp[j], emisivity[j]);
+ else fprintf( handle, "%d, R%d%s, %lf, %e\n", face[i].elem_nr, face[i].nr-1, faceExtention, temp[j], emisivity[j]);
}
else
{
- //if(face[i].nr==0) fprintf( handle, "%d, RNEG, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- //else if(face[i].nr==1) fprintf( handle, "%d, RPOS, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, RPOS, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, RNEG, %lf, %e\n", face[i].elem_nr, temp[j], emisivity[j]);
- else fprintf( handle, "%d, R%d, %lf, %e\n", face[i].elem_nr, face[i].nr+1, temp[j], emisivity[j]);
+ if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, RPOS%s, %lf, %e\n", face[i].elem_nr, faceExtention, temp[j], emisivity[j]);
+ else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, RNEG%s, %lf, %e\n", face[i].elem_nr, faceExtention, temp[j], emisivity[j]);
+ else fprintf( handle, "%d, R%d%s, %lf, %e\n", face[i].elem_nr, face[i].nr+1, faceExtention, temp[j], emisivity[j]);
}
}
- else fprintf( handle, "%d, R%d, %lf, %e\n", face[i].elem_nr, face[i].nr+1, temp[j], emisivity[j]);
+ else fprintf( handle, "%d, R%d%s, %lf, %e\n", face[i].elem_nr, face[i].nr+1, faceExtention, temp[j], emisivity[j]);
}
fclose(handle);
}
@@ -2351,7 +2356,7 @@ void sendDflux( char *setname, char *format, Summen *anz, Nodes *node, Elements
{
int setNr;
int i,j;
- char prognam[MAX_LINE_LENGTH];
+ char prognam[MAX_LINE_LENGTH], label;
double *load;
FILE *handle;
int n, lc, entity;
@@ -2366,8 +2371,16 @@ void sendDflux( char *setname, char *format, Summen *anz, Nodes *node, Elements
if( ((val1!=NULL)&&(val1[0]=='-'))||((val2!=NULL)&&(val2[0]=='-'))||((val3!=NULL)&&(val3[0]=='-')) ) orif=0;
- if(compare(val1, "ds", 2)==2) sprintf(prognam,"%s_%s%s.dfl",setname,val1,val2);
- else sprintf(prognam,"%s.dfl",setname);
+ if(type==0)
+ {
+ if(compare(val1, "ds", 2)==2) sprintf(prognam,"%s_%s%s.dfl",setname,val1,val2);
+ else sprintf(prognam,"%s.dfl",setname);
+ }
+ if(type==1)
+ {
+ if(compare(val1, "ds", 2)==2) sprintf(prognam,"%s_%s%s.mfl",setname,val1,val2);
+ else sprintf(prognam,"%s.mfl",setname);
+ }
printf (" write file: %s\n", prognam );
if((load = (double *)malloc((set[setNr].anz_f+1) * sizeof(double))) == NULL )
@@ -2428,34 +2441,29 @@ void sendDflux( char *setname, char *format, Summen *anz, Nodes *node, Elements
handle = fopen (prognam, "w");
if ( handle== NULL )
{ printf ("\nThe input file %s could not be opened.\n\n", prognam); return; }
- if(type==0) fprintf(handle, "** DFlux based on %s\n", setname);
- if(type==1) fprintf(handle, "** MASSFLOW based on %s\n", setname);
- fprintf(handle, "** DFlux based on %s\n", setname);
+ if(type==0) { fprintf(handle, "** DFlux based on %s\n", setname); label='S'; }
+ if(type==1) { fprintf(handle, "** MASSFLOW based on %s\n", setname); label='M'; }
for (j=0; j<set[setNr].anz_f; j++ )
{
i=set[setNr].face[j];
if(e_enqire[face[i].elem_nr].type>6) // shell
{
if(e_enqire[face[i].elem_nr].type>10) // beam
- fprintf( handle, "%d, S?, %e\n", face[i].elem_nr, load[j]);
+ fprintf( handle, "%d, %c?, %e\n", face[i].elem_nr, label, load[j]);
else if(e_enqire[face[i].elem_nr].attr>3) // plain strain,stress or axissym
{
- //if(face[i].nr==0) fprintf( handle, "%d, SN, %e\n", face[i].elem_nr, load[j]);
- //else if(face[i].nr==1) fprintf( handle, "%d, SP, %e\n", face[i].elem_nr, load[j]);
- if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, SP, %e\n", face[i].elem_nr, load[j]);
- else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, SN, %e\n", face[i].elem_nr, load[j]);
- else fprintf( handle, "%d, S%d, %e\n", face[i].elem_nr, face[i].nr-1, load[j]);
+ if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, %cP, %e\n", face[i].elem_nr, label, load[j]);
+ else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, %cN, %e\n", face[i].elem_nr, label, load[j]);
+ else fprintf( handle, "%d, %c%d, %e\n", face[i].elem_nr, label, face[i].nr-1, load[j]);
}
else
{
- //if(face[i].nr==0) fprintf( handle, "%d, SNEG, %e\n", face[i].elem_nr, load[j]);
- //else if(face[i].nr==1) fprintf( handle, "%d, SPOS, %e\n", face[i].elem_nr, load[j]);
- if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, SPOS, %e\n", face[i].elem_nr, load[j]);
- else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, SNEG, %e\n", face[i].elem_nr, load[j]);
- else fprintf( handle, "%d, S%d, %e\n", face[i].elem_nr, face[i].nr+1, load[j]);
+ if((face[i].nr==1)&&(orif==1)) fprintf( handle, "%d, %cPOS, %e\n", face[i].elem_nr, label, load[j]);
+ else if((face[i].nr==1)&&(orif==0)) fprintf( handle, "%d, %cNEG, %e\n", face[i].elem_nr, label, load[j]);
+ else fprintf( handle, "%d, %c%d, %e\n", face[i].elem_nr, label, face[i].nr-1, load[j]);
}
}
- else fprintf( handle, "%d, S%d, %e\n", face[i].elem_nr, face[i].nr+1, load[j]);
+ else fprintf( handle, "%d, %c%d, %e\n", face[i].elem_nr, label, face[i].nr+1, load[j]);
}
fclose(handle);
}
@@ -2634,9 +2642,9 @@ void sendSPC( char *setname, char *format, Summen *anz, Nodes *node, Elements *e
for (j=0; j<set[setNr].anz_n; j++ )
{
- if( dofstring[i]=='t') fprintf(handle, "%d, %1c, , %e\n",set[setNr].node[j], DOFT, lcase[lc].dat[entity][set[setNr].node[j]] );
- else if( dofstring[i]=='p') fprintf(handle, "%d, %1c, , %e\n",set[setNr].node[j], DOFP, lcase[lc].dat[entity][set[setNr].node[j]] );
- else fprintf(handle, "%d, %1c, , %e\n",set[setNr].node[j], dofstring[i], lcase[lc].dat[entity][set[setNr].node[j]] );
+ if( dofstring[i]=='t') fprintf(handle, "%d, %d, , %e\n",set[setNr].node[j], DOFT, lcase[lc].dat[entity][set[setNr].node[j]] );
+ else if( dofstring[i]=='p') fprintf(handle, "%d, %d, , %e\n",set[setNr].node[j], DOFP, lcase[lc].dat[entity][set[setNr].node[j]] );
+ else fprintf(handle, "%d, %c, , %e\n",set[setNr].node[j], dofstring[i], lcase[lc].dat[entity][set[setNr].node[j]] );
}
}
else
@@ -2645,7 +2653,7 @@ void sendSPC( char *setname, char *format, Summen *anz, Nodes *node, Elements *e
{
if( dofstring[i]=='t') fprintf(handle, "%d, %d, , %s\n",set[setNr].node[j], DOFT, val1 );
else if( dofstring[i]=='p') fprintf(handle, "%d, %d, , %s\n",set[setNr].node[j], DOFP, val1 );
- else fprintf(handle, "%d, %1c, , %s\n",set[setNr].node[j], dofstring[i], val1 );
+ else fprintf(handle, "%d, %c, , %s\n",set[setNr].node[j], dofstring[i], val1 );
}
}
}
diff --git a/cgx_2.10/src/setFunktions.c b/cgx_2.11/src/setFunktions.c
similarity index 99%
rename from cgx_2.10/src/setFunktions.c
rename to cgx_2.11/src/setFunktions.c
index 1104776..d4d114a 100644
--- a/cgx_2.10/src/setFunktions.c
+++ b/cgx_2.11/src/setFunktions.c
@@ -8835,11 +8835,36 @@ int prnt(char *record)
{
j++;
printf ("%-5d %s stat:%c n:%d e:%d f:%d p:%d l:%d s:%d b:%d L:%d S:%d se:%d sh:%d v:%d", set[i].index, set[i].name, set[i].flag, set[i].anz_n, set[i].anz_e, set[i].anz_f, set[i].anz_p, set[i].anz_l, set[i].anz_s, set[i].anz_b, set[i].anz_nurl, set[i].anz_nurs, set[i].anz_se, set[i].anz_sh, set[i].anz_v);
+ sprintf(parameter[0],"%d", set[i].index );
+ sprintf(parameter[1],"%s", set[i].name );
+ sprintf(parameter[2],"%c", set[i].flag );
+ sprintf(parameter[3],"%d", set[i].anz_n );
+ sprintf(parameter[4],"%d", set[i].anz_e );
+ sprintf(parameter[5],"%d", set[i].anz_f );
+ sprintf(parameter[6],"%d", set[i].anz_p );
+ sprintf(parameter[7],"%d", set[i].anz_l );
+ sprintf(parameter[8],"%d", set[i].anz_s );
+ sprintf(parameter[9],"%d", set[i].anz_b );
+ sprintf(parameter[10],"%d", set[i].anz_nurl );
+ sprintf(parameter[11],"%d", set[i].anz_nurs );
+ sprintf(parameter[12],"%d", set[i].anz_se );
+ sprintf(parameter[13],"%d", set[i].anz_sh );
+ sprintf(parameter[14],"%d", set[i].anz_v );
if(compare(param,"range",3)==3)
{
printf (" nr %d %d er %d %d", set[setNr].node[0], set[setNr].node[set[setNr].anz_n-1], set[setNr].elem[0], set[setNr].elem[set[setNr].anz_e-1]);
+ sprintf(parameter[15],"%d", set[i].node[0] );
+ sprintf(parameter[16],"%d", set[i].node[set[setNr].anz_n-1] );
+ sprintf(parameter[17],"%d", set[i].elem[0] );
+ sprintf(parameter[18],"%d", set[i].elem[set[setNr].anz_e-1] );
+ printf ("\n");
+ write2stack(19, parameter);
+ }
+ else
+ {
+ printf ("\n");
+ write2stack(15, parameter);
}
- else printf ("\n");
}
}
}
@@ -9219,9 +9244,9 @@ int prnt(char *record)
(node[nr].nz* scale->w+scale->z) );
sprintf(parameter[0],"%d", nr);
sprintf(parameter[1],"%lf",lcase[cur_lc].dat[cur_entity][nr]);
- sprintf(parameter[1],"%lf",node[nr].nx * scale->w+scale->x);
- sprintf(parameter[2],"%lf",node[nr].ny * scale->w+scale->y);
- sprintf(parameter[3],"%lf",node[nr].nz * scale->w+scale->z);
+ sprintf(parameter[2],"%lf",node[nr].nx * scale->w+scale->x);
+ sprintf(parameter[3],"%lf",node[nr].ny * scale->w+scale->y);
+ sprintf(parameter[4],"%lf",node[nr].nz * scale->w+scale->z);
write2stack(5, parameter);
}
else
@@ -11204,6 +11229,30 @@ int commandoInterpreter( char *type, char *string, int na, int nb, FILE *handle1
}
exit(0);
}
+ else if (compareStrings(type, "FIL")>0)
+ {
+ /* intersection of 2 lines */
+ if (!addFlag) length = sscanf(string, "%*s%s%s%lf", dat[0], dat[1], &x);
+ else
+ {
+ name[0]='!';
+ dat[0][0]=dat[1][0]='%';
+ length = sscanf(string, "%*s%s%s%lf", &dat[0][1], &dat[1][1], &x);
+ }
+ operateAlias( dat[0], "l" );
+ operateAlias( dat[1], "l" );
+ i=getLineNr(dat[0]);
+ j=getLineNr(dat[1]);
+ x/=scale->w;
+
+ pscal=gtol;
+ gtol=MAX_FLOAT;
+ createFillet(i, x);
+ createFillet(j, x);
+ gtol=pscal;
+ repLine(i);
+ repLine(j);
+ }
else if (compareStrings(type, "FLIP")>0)
{
na=sscanf(string, "%*s%s%s",dat[0],dat[1]);
@@ -11293,11 +11342,19 @@ int commandoInterpreter( char *type, char *string, int na, int nb, FILE *handle1
}
else if (compareStrings(type, "GRPA")>0)
{
- printf("ERROR: Not longer supported.\n");
- }
- else if (compareStrings(type, "GROUPS")>0)
- {
- printf("ERROR: Not longer supported.\n");
+ length = sscanf(&string[na+1], "%d %s", &nr, name);
+ if(length<2) { printf(" wrong syntax\n"); goto checkForError; }
+ operateAlias( name, "se" );
+ setNr=getSetNr(name);
+ if (setNr<0)
+ {
+ printf (" ERROR in mata: set:%s does not exist\n", name);
+ goto checkForError;
+ }
+ for (i=0; i<anz->e; i++)
+ {
+ e_enqire[e_enqire[i].nr].group=nr;
+ }
}
else if (compareStrings(type, "GRPS")>0)
{
@@ -11315,7 +11372,7 @@ int commandoInterpreter( char *type, char *string, int na, int nb, FILE *handle1
}
else if (compareStrings(type, "GSUR")>0)
{
- pre_gsur(&string[na+1], addFlag);
+ pre_gsur(&string[na+1], addFlag);
}
else if (compareStrings(type, "GTOL")>0)
{
@@ -11436,6 +11493,29 @@ int commandoInterpreter( char *type, char *string, int na, int nb, FILE *handle1
}
else createHardcopy(2);
}
+ else if (compareStrings(type, "INT")>0)
+ {
+ /* intersection of 2 lines */
+ if (!addFlag) length = sscanf(string, "%*s%s%s", dat[0], dat[1]);
+ else
+ {
+ name[0]='!';
+ dat[0][0]=dat[1][0]='%';
+ length = sscanf(string, "%*s%s%s", &dat[0][1], &dat[1][1]);
+ }
+ operateAlias( dat[0], "l" );
+ operateAlias( dat[1], "l" );
+ i=getLineNr(dat[0]);
+ j=getLineNr(dat[1]);
+
+ pscal=gtol;
+ gtol=MAX_FLOAT;
+ intersect(i);
+ intersect(j);
+ gtol=pscal;
+ repLine(i);
+ repLine(j);
+ }
else if (compareStrings(type, "LCMB")>0)
{
pre_lcmb(&string[na+1], addFlag);
@@ -13117,8 +13197,10 @@ void pre_read( char *record )
/* create the mainmenu */
createDatasetEntries();
}
- else if((compare( ext, "frd", 3)== 3)&&((param1[0])&&compareStrings(param1,"add")<1)&&((param1[0])&&compareStrings(param1,"ext")<1))
+ else if((compare( ext, "frd", 3)== 3)&&((param1[0])&&((compareStrings(param1,"add")<1)&&(compareStrings(param1,"ext")<1)&&(compareStrings(param1,"nom")<1))))
{
+ /* store nodes and elements in set param1 */
+ printf("create set:%s\n",param1);
readfrdfile(datin,param1);
}
else if((compare( ext, "frd", 3)== 3)||(compare( param1, "ng", 2)== 2)||(compare( ext, "stl", 3)== 3)||(compare( ext, "inp", 3)== 3)||(compare( param1, "inp", 3)== 3)||(compare( param1, "foam", 4)== 4))
@@ -13139,7 +13221,8 @@ void pre_read( char *record )
if(compare( ext, "frd", 3)== 3)
{
- readfrd( datin, apre, &npre, &epre, &lpre, 1);
+ //if(readfrd( datin, apre, &npre, &epre, &lpre, 1) <0) return;
+ if(readfrd( datin, apre, &npre, &epre, &lpre, 0) <0) return;
}
else if(compare( param1,"foam",4)==4)
{
@@ -13217,8 +13300,8 @@ void pre_read( char *record )
lpre=NULL;
for(l=0; l<anz->l; l++)
{
- calcDatasets( l, anz, node, lcase );
- recompileEntitiesInMenu(l);
+ if (lcase[l].loaded) calcDatasets( l, anz, node, lcase );
+ if(activWindow!=-1) recompileEntitiesInMenu(l);
}
}
else
@@ -13609,11 +13692,14 @@ void pre_elty( char *record )
{
if(strlen(etype)==3) { set[setNr].etyp=11; set[setNr].eattr=0; }
else if(etype[3]=='D') { set[setNr].etyp=11; set[setNr].eattr=3; }
+ else if(etype[3]=='F') { set[setNr].etyp=11; set[setNr].eattr=7; }
else printf("ERROR: type %s not known\n", etype);
}
else if(compare( etype, "BE3", 3) == 3)
{
- set[setNr].etyp=12; set[setNr].eattr=0;
+ if(strlen(etype)==3) { set[setNr].etyp=12; set[setNr].eattr=0; }
+ else if(etype[3]=='F') { set[setNr].etyp=12; set[setNr].eattr=7; }
+ else printf("ERROR: type %s not known\n", etype);
}
else if(compare( etype, "TR3", 3) == 3)
{
@@ -13664,9 +13750,24 @@ void pre_elty( char *record )
else if(etype[4]=='R') { set[setNr].etyp=4; set[setNr].eattr=1; }
else printf("ERROR: type %s not known\n", etype);
}
+ else if(compare( etype, "PE6", 3) == 3)
+ {
+ if(strlen(etype)==3) { set[setNr].etyp=2; set[setNr].eattr=0; }
+ else if(etype[3]=='R') { set[setNr].etyp=2; set[setNr].eattr=1; }
+ else if(etype[3]=='I') { set[setNr].etyp=2; set[setNr].eattr=2; }
+ else if(etype[3]=='F') { set[setNr].etyp=2; set[setNr].eattr=7; }
+ else printf("ERROR: type %s not known\n", etype);
+ }
+ else if(compare( etype, "PE15", 4) == 4)
+ {
+ if(strlen(etype)==4) { set[setNr].etyp=5; set[setNr].eattr=0; }
+ else if(etype[4]=='R') { set[setNr].etyp=5; set[setNr].eattr=1; }
+ else printf("ERROR: type %s not known\n", etype);
+ }
else if(compare( etype, "TE4", 3) == 3)
{
if(strlen(etype)==3) { set[setNr].etyp=3; set[setNr].eattr=0; }
+ else if(etype[3]=='F') { set[setNr].etyp=3; set[setNr].eattr=7; }
else printf("ERROR: type %s not known\n", etype);
}
else if(compare( etype, "TE10", 4) == 4)
@@ -13684,7 +13785,7 @@ void pre_elty( char *record )
/* assign the element-type to the appropriate entities */
/* assign the attribute */
/* get the basis formulation of the etyp */
- if((set[setNr].etyp==1)||(set[setNr].etyp==3)||(set[setNr].etyp==4)||(set[setNr].etyp==6))
+ if(set[setNr].etyp<7)
{
for (i=0; i<set[setNr].anz_b; i++)
{
@@ -13721,7 +13822,7 @@ void pre_elty( char *record )
}
for (i=0; i<set[setNr].anz_e; i++)
{
- e_enqire[set[setNr].elem[i]].attr=set[setNr].eattr ;
+ if(e_enqire[set[setNr].elem[i]].type==set[setNr].etyp) e_enqire[set[setNr].elem[i]].attr=set[setNr].eattr ;
}
}
}
diff --git a/cgx_2.10/src/shapeFunctions.c b/cgx_2.11/src/shapeFunctions.c
similarity index 100%
rename from cgx_2.10/src/shapeFunctions.c
rename to cgx_2.11/src/shapeFunctions.c
diff --git a/cgx_2.10/src/sins.c b/cgx_2.11/src/sins.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/sins.c
rename to cgx_2.11/src/sins.c
diff --git a/cgx_2.10/src/spline.c b/cgx_2.11/src/spline.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/spline.c
rename to cgx_2.11/src/spline.c
diff --git a/cgx_2.10/src/splitElementsToTets.c b/cgx_2.11/src/splitElementsToTets.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/splitElementsToTets.c
rename to cgx_2.11/src/splitElementsToTets.c
diff --git a/cgx_2.10/src/stof.c b/cgx_2.11/src/stof.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/stof.c
rename to cgx_2.11/src/stof.c
diff --git a/cgx_2.10/src/stoi.c b/cgx_2.11/src/stoi.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/stoi.c
rename to cgx_2.11/src/stoi.c
diff --git a/cgx_2.10/src/stopClock.c b/cgx_2.11/src/stopClock.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/stopClock.c
rename to cgx_2.11/src/stopClock.c
diff --git a/cgx_2.10/src/stos.c b/cgx_2.11/src/stos.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/stos.c
rename to cgx_2.11/src/stos.c
diff --git a/cgx_2.10/src/strfind.c b/cgx_2.11/src/strfind.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/strfind.c
rename to cgx_2.11/src/strfind.c
diff --git a/cgx_2.10/src/strsplt.c b/cgx_2.11/src/strsplt.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/strsplt.c
rename to cgx_2.11/src/strsplt.c
diff --git a/cgx_2.10/src/surfMesh2.c b/cgx_2.11/src/surfMesh2.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/surfMesh2.c
rename to cgx_2.11/src/surfMesh2.c
diff --git a/cgx_2.10/src/sword.c b/cgx_2.11/src/sword.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/sword.c
rename to cgx_2.11/src/sword.c
diff --git a/cgx_2.10/src/trackball.c b/cgx_2.11/src/trackball.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/trackball.c
rename to cgx_2.11/src/trackball.c
diff --git a/cgx_2.10/src/trackball.h b/cgx_2.11/src/trackball.h
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/trackball.h
rename to cgx_2.11/src/trackball.h
diff --git a/cgx_2.10/src/uselibSNL.cpp b/cgx_2.11/src/uselibSNL.cpp
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/uselibSNL.cpp
rename to cgx_2.11/src/uselibSNL.cpp
diff --git a/cgx_2.10/src/uselibSNL.h b/cgx_2.11/src/uselibSNL.h
similarity index 100%
rename from cgx_2.10/src/uselibSNL.h
rename to cgx_2.11/src/uselibSNL.h
diff --git a/cgx_2.10/src/userFunction.c b/cgx_2.11/src/userFunction.c
old mode 100644
new mode 100755
similarity index 99%
rename from cgx_2.10/src/userFunction.c
rename to cgx_2.11/src/userFunction.c
index eb4ea4c..96f960e
--- a/cgx_2.10/src/userFunction.c
+++ b/cgx_2.11/src/userFunction.c
@@ -100,9 +100,10 @@ void userFunction(char *string, Summen *sum, SumGeo *sumGeo )
printf(" energy <set> <dataset-nr> <dataset-nr> // calculate Energy = SUM(FORC*DISP) between both datasets\n");
printf(" Fshear <set> <dataset-nr> <factor> <fstat> <mue> //force components normal and co-planar based on RF\n");
printf(" fuss nblades distAEplane // generates input for fuss based on bladiator output\n");
- printf(" htc <set> <dataset-nr> <entity-nr> rauh1 rauh2 lambda1 lambda2 hrd_m\n");
- printf(" loadcase of pressure, lambda_fluid=0.06 W/mK (900K) hard wired \n");
- printf(" rauh in m, lambda in W/mK, hrd_m in pressure units, temp in K, pressure in Pa // htc between two faces in contact\n");
+ printf(" htc <set> <dataset-nr> <entity-nr> rauh1 rauh2 lambda1 lambda2 hrd_m // htc [W/m2/K] between two faces in contact\n");
+ printf(" loadcase of pressure [MPa], lambda_fluid=0.06 W/mK (900K) hard wired \n");
+ printf(" rauh in m, lambda in W/mK, hrd_m (hardness of softer mat [Pa!]), temp in K\n");
+ printf(" -> div by 1e3 to get the usual [N/s/mm/K]\n");
printf(" hydro // hydrostatic pressure\n");
printf(" lift <setin> <setprofil> // for cfd (tbd)\n");
printf(" mass // for cfd, integrates the mass of the mesh for all time-steps\n");
@@ -1286,6 +1287,13 @@ G=E/2(nu+1)
lcase[sum->l].irtype = 1;
lcase[sum->l].npheader = 0 ;
lcase[sum->l].value = lcase[l].value ;
+ sprintf( lcase[sum->l].dataset_name," ");
+ strcpy(lcase[sum->l].dataset_text,"");
+ strcpy(lcase[sum->l].analysis_name,lcase[l].analysis_name);
+ lcase[sum->l].step_number=lcase[l].step_number;
+ lcase[sum->l].analysis_type=lcase[l].analysis_type;
+ lcase[sum->l].loaded = 1;
+ lcase[sum->l].fileptr = NULL;
if ( (lcase[sum->l].nmax = (int *)malloc( lcase[sum->l].ncomps * sizeof(int))) == NULL )
printf("\n\n ERROR: malloc failure\n\n" );
diff --git a/cgx_2.10/src/v_add.c b/cgx_2.11/src/v_add.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_add.c
rename to cgx_2.11/src/v_add.c
diff --git a/cgx_2.10/src/v_angle.c b/cgx_2.11/src/v_angle.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_angle.c
rename to cgx_2.11/src/v_angle.c
diff --git a/cgx_2.10/src/v_angle_ref.c b/cgx_2.11/src/v_angle_ref.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_angle_ref.c
rename to cgx_2.11/src/v_angle_ref.c
diff --git a/cgx_2.10/src/v_betrag.c b/cgx_2.11/src/v_betrag.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_betrag.c
rename to cgx_2.11/src/v_betrag.c
diff --git a/cgx_2.10/src/v_distA.c b/cgx_2.11/src/v_distA.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_distA.c
rename to cgx_2.11/src/v_distA.c
diff --git a/cgx_2.10/src/v_matmult.c b/cgx_2.11/src/v_matmult.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_matmult.c
rename to cgx_2.11/src/v_matmult.c
diff --git a/cgx_2.10/src/v_norm.c b/cgx_2.11/src/v_norm.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_norm.c
rename to cgx_2.11/src/v_norm.c
diff --git a/cgx_2.10/src/v_prod.c b/cgx_2.11/src/v_prod.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_prod.c
rename to cgx_2.11/src/v_prod.c
diff --git a/cgx_2.10/src/v_rec2cyl.c b/cgx_2.11/src/v_rec2cyl.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_rec2cyl.c
rename to cgx_2.11/src/v_rec2cyl.c
diff --git a/cgx_2.10/src/v_result.c b/cgx_2.11/src/v_result.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_result.c
rename to cgx_2.11/src/v_result.c
diff --git a/cgx_2.10/src/v_rot.c b/cgx_2.11/src/v_rot.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_rot.c
rename to cgx_2.11/src/v_rot.c
diff --git a/cgx_2.10/src/v_scal.c b/cgx_2.11/src/v_scal.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_scal.c
rename to cgx_2.11/src/v_scal.c
diff --git a/cgx_2.10/src/v_sprod.c b/cgx_2.11/src/v_sprod.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/v_sprod.c
rename to cgx_2.11/src/v_sprod.c
diff --git a/cgx_2.10/src/write2aba.c b/cgx_2.11/src/write2aba.c
old mode 100644
new mode 100755
similarity index 89%
rename from cgx_2.10/src/write2aba.c
rename to cgx_2.11/src/write2aba.c
index 6aff662..a2452f4
--- a/cgx_2.10/src/write2aba.c
+++ b/cgx_2.11/src/write2aba.c
@@ -28,7 +28,7 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
FILE *handle1=NULL, *handle2=NULL;
int i,j, lc, n, lendatout;
double oldtime=0, iniTime=0.001, time1=0, time2=0, frc1=0, frc2=0, tmin, tmax;
-
+ char inletflag=0;
/* Open the files and check to see that it was opened correctly */
@@ -83,7 +83,8 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
{
if((i==0) || ((i>0)&&(elem[i-1].type!=elem[i].type)) || ((i>0)&&(elem[i-1].attr!=elem[i].attr)))
{
- fprintf (handle1, "*ELEMENT, TYPE=C3D4, ELSET=E%s\n", anz->model);
+ if (elem[i].attr==7) fprintf (handle1, "*ELEMENT, TYPE=F3D4, ELSET=E%s\n", anz->model);
+ else fprintf (handle1, "*ELEMENT, TYPE=C3D4, ELSET=E%s\n", anz->model);
}
fprintf (handle1, "%6d,%6d,%6d,%6d,%6d \n",
elem[i].nr, elem[i].nod[0], elem[i].nod[1], elem[i].nod[2],
@@ -174,10 +175,10 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
{
if((i==0) || ((i>0)&&(elem[i-1].type!=elem[i].type)) || ((i>0)&&(elem[i-1].attr!=elem[i].attr)))
{
- if (elem[i].attr==4) fprintf (handle1, "*ELEMENT, TYPE=CPE8R, ELSET=E%s\n", anz->model);
- else if (elem[i].attr==5) fprintf (handle1, "*ELEMENT, TYPE=CPS8R, ELSET=E%s\n", anz->model);
- else if (elem[i].attr==6) fprintf (handle1, "*ELEMENT, TYPE=CAX8R, ELSET=E%s\n", anz->model);
- else fprintf (handle1, "*ELEMENT, TYPE=S8R, ELSET=E%s\n", anz->model);
+ if (elem[i].attr==4) fprintf (handle1, "*ELEMENT, TYPE=CPE8, ELSET=E%s\n", anz->model);
+ else if (elem[i].attr==5) fprintf (handle1, "*ELEMENT, TYPE=CPS8, ELSET=E%s\n", anz->model);
+ else if (elem[i].attr==6) fprintf (handle1, "*ELEMENT, TYPE=CAX8, ELSET=E%s\n", anz->model);
+ else fprintf (handle1, "*ELEMENT, TYPE=S8, ELSET=E%s\n", anz->model);
}
fprintf (handle1, "%6d, %6d, %6d, %6d, %6d, %6d, %6d, %6d, %6d\n"
, elem[i].nr, elem[i].nod[0], elem[i].nod[1], elem[i].nod[2], elem[i].nod[3]
@@ -185,9 +186,35 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
}
else if (elem[i].type == 11)
{
+ printf("e:%d attr:%d\n", elem[i].nr,elem[i].attr);
if((i==0) || ((i>0)&&(elem[i-1].type!=elem[i].type)) || ((i>0)&&(elem[i-1].attr!=elem[i].attr)))
{
if (elem[i].attr==3) fprintf (handle1, "*ELEMENT, TYPE=DASHPOTA, ELSET=E%s\n", anz->model);
+ else if (elem[i].attr==7)
+ {
+ fprintf (handle1, "*ELEMENT, TYPE=D, ELSET=E%s\n", anz->model);
+ // search the connected node
+ for (j=0; j<anz->e; j++)
+ {
+ if(elem[j].type == 12)
+ {
+ if( (elem[j].nod[0]==elem[i].nod[0])||(elem[j].nod[2]==elem[i].nod[0]) ) { inletflag=0; break; }
+ if( (elem[j].nod[0]==elem[i].nod[1])||(elem[j].nod[2]==elem[i].nod[1]) ) { inletflag=1; break; }
+ }
+ }
+ if(inletflag)
+ {
+ fprintf (handle1, "%6d, 0, %6d, %6d\n",
+ elem[i].nr, elem[i].nod[0], elem[i].nod[1] );
+ inletflag=0;
+ }
+ else
+ {
+ fprintf (handle1, "%6d, %6d, %6d, 0\n",
+ elem[i].nr, elem[i].nod[0], elem[i].nod[1] );
+ }
+ continue;
+ }
else fprintf (handle1, "*ELEMENT, TYPE=B31, ELSET=E%s\n", anz->model);
}
fprintf (handle1, "%6d, %6d, %6d\n",
@@ -197,7 +224,8 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
{
if((i==0) || ((i>0)&&(elem[i-1].type!=elem[i].type)) || ((i>0)&&(elem[i-1].attr!=elem[i].attr)))
{
- fprintf (handle1, "*ELEMENT, TYPE=B32R, ELSET=E%s\n", anz->model);
+ if (elem[i].attr==7) fprintf (handle1, "*ELEMENT, TYPE=D, ELSET=E%s\n", anz->model);
+ else fprintf (handle1, "*ELEMENT, TYPE=B32R, ELSET=E%s\n", anz->model);
}
fprintf (handle1, "%6d, %6d, %6d, %6d\n",
elem[i].nr, elem[i].nod[0], elem[i].nod[2], elem[i].nod[1] );
@@ -305,15 +333,15 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
tmin = time2/10.;
tmax = time2;
fprintf (handle2, "** --- LC%d ---\n", j);
- fprintf (handle2, "*STEP, NLGEOM, INC=400, AMPLITUDE=RAMP\n");
+ fprintf (handle2, "*STEP, NLGEOM, AMPLITUDE=RAMP\n");
fprintf (handle2, "*VISCO, CETOL=5.e-4\n");
fprintf (handle2, "%lf, %lf,,,\n", tmin, tmax);
- fprintf (handle2, "**CLOAD, AMPLITUDE=FORCE%d\n", j);
- fprintf (handle2, "**include, input=ccx.clo\n");
+ fprintf (handle2, "*CLOAD, AMPLITUDE=FORCE%d\n", j);
+ fprintf (handle2, "*include, input=ccx.clo\n");
fprintf (handle2, "*DLOAD\n");
fprintf (handle2, "Eall, CENTRIF, %f, 0., 0., 0., 1., 0., 0\n", frc2*(atof(dat[2])/60.*2*PI)*(atof(dat[2])/60.*2*PI));
- fprintf (handle2, "**DLOAD, AMPLITUDE=FORCE%d\n", j);
- fprintf (handle2, "**include, input=ccx.dlo\n");
+ fprintf (handle2, "*DLOAD, AMPLITUDE=FORCE%d\n", j);
+ fprintf (handle2, "*include, input=ccx.dlo\n");
fprintf (handle2, "*TEMPERATURE\n");
}
if(compare( dat[0], "sta", 3)== 3)
@@ -324,15 +352,15 @@ int write2aba( char *datout, Summen *anz, Nodes *node, Elements *elem, Datasets
oldtime=(lcase[lc].value);
frc2 = (atof(lcase[lc].dataset_text)*atof(lcase[lc].dataset_text))/(atof(dat[2])*atof(dat[2]));
fprintf (handle2, "** --- LC%d ---\n", j);
- fprintf (handle2, "*STEP\n");
+ fprintf (handle2, "*STEP, NLGEOM\n");
fprintf (handle2, "*STATIC\n");
fprintf (handle2, "%lf, %lf,,,\n", time2, time2);
- fprintf (handle2, "**CLOAD, AMPLITUDE=FORCE%d\n", j);
- fprintf (handle2, "**include, input=ccx.clo\n");
+ fprintf (handle2, "*CLOAD, AMPLITUDE=FORCE%d\n", j);
+ fprintf (handle2, "*include, input=ccx.clo\n");
fprintf (handle2, "*DLOAD\n");
fprintf (handle2, "Eall, CENTRIF, %f, 0., 0., 0., 1., 0., 0\n", frc2*(atof(dat[2])/60.*2*PI)*(atof(dat[2])/60.*2*PI));
- fprintf (handle2, "**DLOAD, AMPLITUDE=FORCE%d\n", j);
- fprintf (handle2, "**include, input=ccx.dlo\n");
+ fprintf (handle2, "*DLOAD, AMPLITUDE=FORCE%d\n", j);
+ fprintf (handle2, "*include, input=ccx.dlo\n");
fprintf (handle2, "*TEMPERATURE\n");
}
diff --git a/cgx_2.10/src/write2ansys.c b/cgx_2.11/src/write2ansys.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2ansys.c
rename to cgx_2.11/src/write2ansys.c
diff --git a/cgx_2.10/src/write2aster.c b/cgx_2.11/src/write2aster.c
similarity index 100%
rename from cgx_2.10/src/write2aster.c
rename to cgx_2.11/src/write2aster.c
diff --git a/cgx_2.10/src/write2darwin.c b/cgx_2.11/src/write2darwin.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2darwin.c
rename to cgx_2.11/src/write2darwin.c
diff --git a/cgx_2.10/src/write2dolfyn.c b/cgx_2.11/src/write2dolfyn.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2dolfyn.c
rename to cgx_2.11/src/write2dolfyn.c
diff --git a/cgx_2.10/src/write2duns.c b/cgx_2.11/src/write2duns.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2duns.c
rename to cgx_2.11/src/write2duns.c
diff --git a/cgx_2.10/src/write2foam.c b/cgx_2.11/src/write2foam.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2foam.c
rename to cgx_2.11/src/write2foam.c
diff --git a/cgx_2.10/src/write2frd.c b/cgx_2.11/src/write2frd.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2frd.c
rename to cgx_2.11/src/write2frd.c
diff --git a/cgx_2.10/src/write2isaac.c b/cgx_2.11/src/write2isaac.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2isaac.c
rename to cgx_2.11/src/write2isaac.c
diff --git a/cgx_2.10/src/write2nas.c b/cgx_2.11/src/write2nas.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2nas.c
rename to cgx_2.11/src/write2nas.c
diff --git a/cgx_2.10/src/write2samcef.c b/cgx_2.11/src/write2samcef.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2samcef.c
rename to cgx_2.11/src/write2samcef.c
diff --git a/cgx_2.10/src/write2tochnog.c b/cgx_2.11/src/write2tochnog.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/write2tochnog.c
rename to cgx_2.11/src/write2tochnog.c
diff --git a/cgx_2.10/src/writebp.c b/cgx_2.11/src/writebp.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/writebp.c
rename to cgx_2.11/src/writebp.c
diff --git a/cgx_2.10/src/writefbd.c b/cgx_2.11/src/writefbd.c
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/writefbd.c
rename to cgx_2.11/src/writefbd.c
diff --git a/cgx_2.10/src/xwd.h b/cgx_2.11/src/xwd.h
old mode 100644
new mode 100755
similarity index 100%
rename from cgx_2.10/src/xwd.h
rename to cgx_2.11/src/xwd.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/calculix-cgx.git
More information about the debian-science-commits
mailing list