diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
deleted file mode 100755
index 5866aa8f371296d65d50ffd0b6454e745502bcb4..0000000000000000000000000000000000000000
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "$TEC_360_2009" ]
-then
- wmake
-fi
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
index d03f44ae8cd509c3bcec9b62b2c7fc1ec3c31185..0c2c8b721607451a821a332a47319da09606246a 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Make/options
@@ -1,14 +1,12 @@
EXE_INC = \
- -I$(TEC_360_2009)/include \
- /* -I../tecio/tecsrc/lnInclude/ */ \
+ -I$(WM_THIRD_PARTY_DIR)/tecio/tecsrc/lnInclude \
-I$(LIB_SRC)/lagrangian/basic/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
EXE_LIBS = \
- $(TEC_360_2009)/lib/tecio64.a \
- /* -L$(FOAM_USER_LIBBIN) -ltecio */ \
+ -ltecio \
-llagrangian \
-lfiniteVolume \
-lmeshTools
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
index d514609ff2ac93904ef354e35880f8d21b458831..8ed17ebffb190f42d4589bf1ecd0eac777d788d3 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -65,6 +65,9 @@ Usage
information as a single argument. The double quotes denote a regular
expression.
+ @param -useTimeName \n
+ use the time index in the VTK file name instead of the time index
+
\*---------------------------------------------------------------------------*/
#include "pointMesh.H"
@@ -240,7 +243,7 @@ int main(int argc, char *argv[])
# include "createNamedMesh.H"
// TecplotData/ directory in the case
- fileName fvPath(runTime.path()/"TecplotData-bin");
+ fileName fvPath(runTime.path()/"Tecplot360");
// Directory of mesh (region0 gets filtered out)
fileName regionPrefix = "";
@@ -536,7 +539,8 @@ int main(int argc, char *argv[])
varLocation
);
- // strandID (= some zone id)
+ // strandID (= piece id. Gets incremented for every piece of geometry
+ // that is output)
INTEGER4 strandID = 1;
@@ -647,7 +651,7 @@ int main(int argc, char *argv[])
writer.writePolyhedralZone
(
mesh.name(), // regionName
- 1, //strandID, // strandID
+ strandID, // strandID
mesh,
List<INTEGER4>(3, ValueLocation_Nodal),
nFaceNodes
@@ -684,7 +688,7 @@ int main(int argc, char *argv[])
writer.writePolyhedralZone
(
mesh.name(), // regionName
- 1, //strandID, // strandID
+ strandID++, // strandID
mesh,
varLocation,
0
@@ -776,7 +780,7 @@ int main(int argc, char *argv[])
writer.writePolygonalZone
(
setName,
- 1, //strandID,
+ strandID++,
ipp,
allVarLocation
);
@@ -903,7 +907,7 @@ int main(int argc, char *argv[])
{
label patchID = patchIDs[i];
const polyPatch& pp = patches[patchID];
- INTEGER4 strandID = 1 + i;
+ //INTEGER4 strandID = 1 + i;
Info<< " Writing patch " << patchID << "\t" << pp.name()
<< "\tstrand:" << strandID << nl << endl;
@@ -917,7 +921,7 @@ int main(int argc, char *argv[])
writer.writePolygonalZone
(
pp.name(),
- strandID,
+ strandID++, //strandID,
ipp,
allVarLocation
);
@@ -1073,7 +1077,7 @@ int main(int argc, char *argv[])
writer.writePolygonalZone
(
pp.name(),
- 1+patchIDs.size()+zoneI, //strandID,
+ strandID++, //1+patchIDs.size()+zoneI, //strandID,
ipp,
allVarLocation
);
@@ -1196,29 +1200,29 @@ int main(int argc, char *argv[])
Info<< " vectors :";
print(Info, vectorNames);
- wordList sphereNames
- (
- sprayObjs.names
- (
- sphericalTensorIOField::typeName
- )
- );
- Info<< " spherical tensors :";
- print(Info, sphereNames);
-
- wordList symmNames
- (
- sprayObjs.names
- (
- symmTensorIOField::typeName
- )
- );
- Info<< " symm tensors :";
- print(Info, symmNames);
-
- wordList tensorNames(sprayObjs.names(tensorIOField::typeName));
- Info<< " tensors :";
- print(Info, tensorNames);
+ //wordList sphereNames
+ //(
+ // sprayObjs.names
+ // (
+ // sphericalTensorIOField::typeName
+ // )
+ //);
+ //Info<< " spherical tensors :";
+ //print(Info, sphereNames);
+ //
+ //wordList symmNames
+ //(
+ // sprayObjs.names
+ // (
+ // symmTensorIOField::typeName
+ // )
+ //);
+ //Info<< " symm tensors :";
+ //print(Info, symmNames);
+ //
+ //wordList tensorNames(sprayObjs.names(tensorIOField::typeName));
+ //Info<< " tensors :";
+ //print(Info, tensorNames);
// Load cloud positions
@@ -1277,7 +1281,7 @@ int main(int argc, char *argv[])
writer.writeOrderedZone
(
cloudDirs[cloudI],
- strandID,
+ strandID++, //strandID,
parcels.size(),
allVarLocation
);
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
index 47165d80a448adbec08991a0e7de239e1314a8cf..97e94d49824adfa674665e7e90aa498d2493b0b7 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriter.C
@@ -79,7 +79,7 @@ Pout<< endl
void Foam::tecplotWriter::writePolyhedralZone
(
const word& zoneName,
- const INTEGER4 strandID,
+ INTEGER4 strandID,
const fvMesh& mesh,
const List<INTEGER4>& varLocArray,
INTEGER4 nFaceNodes
@@ -95,7 +95,6 @@ void Foam::tecplotWriter::writePolyhedralZone
INTEGER4 KCellMax = 0; /* Not Used, set to zero */
double SolTime = runTime_.value(); /* solution time */
- INTEGER4 StrandID = 1; /* static zone */
INTEGER4 ParentZone = 0; /* no parent zone */
INTEGER4 IsBlock = 1; /* block format */
@@ -135,7 +134,7 @@ Pout<< "zoneName:" << zoneName
&JCellMax,
&KCellMax,
&SolTime,
- &StrandID,
+ &strandID,
&ParentZone,
&IsBlock,
&NFConns,
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
index f337b20d380836f9f06d2634f19470c0c108a407..f9a01d57a4ba31bd3aef10148a75ac0efb8554f9 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/tecplotWriterTemplates.C
@@ -26,11 +26,11 @@ License
#include "tecplotWriter.H"
-extern "C"
-{
+//extern "C"
+//{
#include "MASTER.h"
#include "GLOBAL.h"
-}
+//}
#include "fvc.H"