diff --git a/applications/solvers/DNS/dnsFoam/Make/options b/applications/solvers/DNS/dnsFoam/Make/options index 34c3503a51..e0e7a30d72 100644 --- a/applications/solvers/DNS/dnsFoam/Make/options +++ b/applications/solvers/DNS/dnsFoam/Make/options @@ -1,10 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/randomProcesses/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/randomProcesses/lnInclude EXE_LIBS = \ -lfiniteVolume \ - -lrandomProcesses \ - -lsampling \ - -lmeshTools + -lrandomProcesses diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index 135659c276..b6c6398fde 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -5,7 +5,6 @@ EXE_INC = \ -IPDRModels/dragModels/PDRDragModel \ -IlaminarFlameSpeed/SCOPE \ -I$(LIB_SRC)/engine/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 0812df5e3b..3a07a7de58 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/thermophysicalModels/laminarFlameSpeed/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ @@ -17,5 +17,5 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ - -lfiniteVolume \ - -lmeshTools + -lmeshTools \ + -lfiniteVolume diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index 25217ab23f..2eaea744b0 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -20,6 +20,5 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume \ - -lsampling \ -lmeshTools \ -lfieldSources diff --git a/applications/solvers/incompressible/icoFoam/Make/options b/applications/solvers/incompressible/icoFoam/Make/options index fa15f12452..d38cd8b180 100644 --- a/applications/solvers/incompressible/icoFoam/Make/options +++ b/applications/solvers/incompressible/icoFoam/Make/options @@ -1,5 +1,7 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lfiniteVolume + -lfiniteVolume \ + -lsampling diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options index 2228fc2b12..27241b2965 100644 --- a/applications/utilities/mesh/generation/cvMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/Make/options @@ -17,7 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude @@ -30,6 +30,6 @@ EXE_LIBS = \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ -ledgeMesh \ - -lsampling \ + -lfileFormats \ -ltriSurface \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options index 62649cf232..2082f88ff0 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/Make/options @@ -17,7 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I../vectorTools @@ -25,5 +25,6 @@ EXE_INC = \ EXE_LIBS = \ -lmeshTools \ -ledgeMesh \ + -lfileFormats \ -ltriSurface \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options index 2d1ad7bfda..ed71a80029 100644 --- a/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/cvMeshBackgroundMesh/Make/options @@ -11,10 +11,11 @@ EXE_INC = \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude EXE_LIBS = \ @@ -24,8 +25,9 @@ EXE_LIBS = \ -lconformalVoronoiMesh \ -ldecompositionMethods /* -L$(FOAM_LIBBIN)/dummy -lscotchDecomp */ \ -ledgeMesh \ - -lsampling \ -ltriSurface \ -lmeshTools \ + -lfileFormats \ + -lsampling \ -ldynamicMesh \ -lfiniteVolume diff --git a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options index 35c90b1f48..7bd92a24ab 100644 --- a/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options +++ b/applications/utilities/mesh/generation/cvMesh/cvMeshSurfaceSimplify/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(FASTDUALOCTREE_SRC_PATH) \ -I../conformalVoronoiMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -22,7 +22,7 @@ EXE_LIBS = \ -lconformalVoronoiMesh \ -ldecompositionMethods -L$(FOAM_LIBBIN)/dummy -lscotchDecomp \ -ledgeMesh \ - -lsampling \ + -lfileFormats \ -ltriSurface \ -lmeshTools \ -ldynamicMesh diff --git a/applications/utilities/mesh/generation/snappyHexMesh/Make/options b/applications/utilities/mesh/generation/snappyHexMesh/Make/options index 94ff17ee99..af056ec7cb 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options +++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/mesh/autoMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ @@ -14,6 +14,6 @@ EXE_LIBS = \ -ldecompositionMethods \ -L$(FOAM_LIBBIN)/dummy -lptscotchDecomp \ -lmeshTools \ - -lsampling \ + -lfileFormats \ -ldynamicMesh \ -lautoMesh diff --git a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options index 5c515d8f95..87b4324810 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options +++ b/applications/utilities/postProcessing/dataConversion/foamToGMV/Make/options @@ -1,15 +1,9 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/turbulenceModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ - -I$(LIB_SRC)/lagrangian/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ - -I$(LIB_SRC)/browser/lnInclude \ - -I$(LIB_SRC)/foam/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options index 3bcea78b3b..b653926f93 100644 --- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options @@ -1,12 +1,12 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude EXE_LIBS = \ -lfiniteVolume \ -lmeshTools \ - -lsampling \ + -lfileFormats \ -lgenericPatchFields \ -llagrangian diff --git a/applications/utilities/postProcessing/sampling/sample/Make/options b/applications/utilities/postProcessing/sampling/sample/Make/options index 88c6039b4e..4de726a20f 100644 --- a/applications/utilities/postProcessing/sampling/sample/Make/options +++ b/applications/utilities/postProcessing/sampling/sample/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude @@ -9,6 +10,7 @@ EXE_LIBS = \ -lfiniteVolume \ -lgenericPatchFields \ -lmeshTools \ + -lfileFormats \ -lsampling \ -lsurfMesh \ -llagrangian diff --git a/applications/utilities/postProcessing/velocityField/Pe/Make/options b/applications/utilities/postProcessing/velocityField/Pe/Make/options index 29d9b4d8c3..1d984aa9b5 100644 --- a/applications/utilities/postProcessing/velocityField/Pe/Make/options +++ b/applications/utilities/postProcessing/velocityField/Pe/Make/options @@ -5,8 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ $(FOAM_LIBBIN)/postCalc.o \ diff --git a/applications/utilities/preProcessing/boxTurb/Make/options b/applications/utilities/preProcessing/boxTurb/Make/options index 749a3d5124..e24cee9cb9 100644 --- a/applications/utilities/preProcessing/boxTurb/Make/options +++ b/applications/utilities/preProcessing/boxTurb/Make/options @@ -1,10 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/randomProcesses/lnInclude \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ -lrandomProcesses \ - -lsampling \ - -lmeshTools \ -lfiniteVolume diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C index 155c4c2eb4..8619e2da91 100644 --- a/src/OpenFOAM/db/Time/Time.C +++ b/src/OpenFOAM/db/Time/Time.C @@ -324,6 +324,7 @@ Foam::Time::Time secondaryWriteControl_(wcTimeStep), secondaryWriteInterval_(labelMax/10.0), // bit less to allow calculations purgeWrite_(0), + secondaryPurgeWrite_(0), writeOnce_(false), subCycling_(false), sigWriteNow_(true, *this), @@ -416,6 +417,7 @@ Foam::Time::Time secondaryWriteControl_(wcTimeStep), secondaryWriteInterval_(labelMax/10.0), purgeWrite_(0), + secondaryPurgeWrite_(0), writeOnce_(false), subCycling_(false), sigWriteNow_(true, *this), @@ -511,6 +513,7 @@ Foam::Time::Time secondaryWriteControl_(wcTimeStep), secondaryWriteInterval_(labelMax/10.0), purgeWrite_(0), + secondaryPurgeWrite_(0), writeOnce_(false), subCycling_(false), sigWriteNow_(true, *this), @@ -608,6 +611,7 @@ Foam::Time::Time secondaryWriteControl_(wcTimeStep), secondaryWriteInterval_(labelMax/10.0), purgeWrite_(0), + secondaryPurgeWrite_(0), writeOnce_(false), subCycling_(false), @@ -1070,11 +1074,13 @@ Foam::Time& Foam::Time::operator++() outputTime_ = false; + primaryOutputTime_ = false; + secondaryOutputTime_ = false; switch (writeControl_) { case wcTimeStep: - outputTime_ = !(timeIndex_ % label(writeInterval_)); + primaryOutputTime_ = !(timeIndex_ % label(writeInterval_)); break; case wcRunTime: @@ -1088,7 +1094,7 @@ Foam::Time& Foam::Time::operator++() if (outputIndex > outputTimeIndex_) { - outputTime_ = true; + primaryOutputTime_ = true; outputTimeIndex_ = outputIndex; } } @@ -1103,7 +1109,7 @@ Foam::Time& Foam::Time::operator++() ); if (outputIndex > outputTimeIndex_) { - outputTime_ = true; + primaryOutputTime_ = true; outputTimeIndex_ = outputIndex; } } @@ -1118,7 +1124,7 @@ Foam::Time& Foam::Time::operator++() ); if (outputIndex > outputTimeIndex_) { - outputTime_ = true; + primaryOutputTime_ = true; outputTimeIndex_ = outputIndex; } } @@ -1130,9 +1136,8 @@ Foam::Time& Foam::Time::operator++() switch (secondaryWriteControl_) { case wcTimeStep: - outputTime_ = - outputTime_ - || !(timeIndex_ % label(secondaryWriteInterval_)); + secondaryOutputTime_ = + !(timeIndex_ % label(secondaryWriteInterval_)); break; case wcRunTime: @@ -1146,7 +1151,7 @@ Foam::Time& Foam::Time::operator++() if (outputIndex > secondaryOutputTimeIndex_) { - outputTime_ = true; + secondaryOutputTime_ = true; secondaryOutputTimeIndex_ = outputIndex; } } @@ -1161,7 +1166,7 @@ Foam::Time& Foam::Time::operator++() ); if (outputIndex > secondaryOutputTimeIndex_) { - outputTime_ = true; + secondaryOutputTime_ = true; secondaryOutputTimeIndex_ = outputIndex; } } @@ -1176,7 +1181,7 @@ Foam::Time& Foam::Time::operator++() ); if (outputIndex > secondaryOutputTimeIndex_) { - outputTime_ = true; + secondaryOutputTime_ = true; secondaryOutputTimeIndex_ = outputIndex; } } @@ -1184,6 +1189,9 @@ Foam::Time& Foam::Time::operator++() } + outputTime_ = primaryOutputTime_ || secondaryOutputTime_; + + // see if endTime needs adjustment to stop at the next run()/end() check if (!end()) { @@ -1195,6 +1203,7 @@ Foam::Time& Foam::Time::operator++() { endTime_ = value(); outputTime_ = true; + primaryOutputTime_ = true; } else if (stopAt_ == saNextWrite && outputTime_ == true) { @@ -1205,6 +1214,7 @@ Foam::Time& Foam::Time::operator++() // Override outputTime if one-shot writing if (writeOnce_) { + primaryOutputTime_ = true; outputTime_ = true; writeOnce_ = false; } diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H index 26e6b21bc7..1e761cd73e 100644 --- a/src/OpenFOAM/db/Time/Time.H +++ b/src/OpenFOAM/db/Time/Time.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -138,10 +138,15 @@ protected: scalar secondaryWriteInterval_; - label purgeWrite_; mutable FIFOStack previousOutputTimes_; + // Additional purging + + label secondaryPurgeWrite_; + mutable FIFOStack previousSecondaryOutputTimes_; + + // One-shot writing bool writeOnce_; diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C index 6a80618404..1637d35bfc 100644 --- a/src/OpenFOAM/db/Time/TimeIO.C +++ b/src/OpenFOAM/db/Time/TimeIO.C @@ -160,6 +160,20 @@ void Foam::Time::readDict() } } + if (controlDict_.readIfPresent("secondaryPurgeWrite", secondaryPurgeWrite_)) + { + if (secondaryPurgeWrite_ < 0) + { + WarningIn("Time::readDict()") + << "invalid value for secondaryPurgeWrite " + << secondaryPurgeWrite_ + << ", should be >= 0, setting to 0" + << endl; + + secondaryPurgeWrite_ = 0; + } + } + if (controlDict_.found("timeFormat")) { const word formatName(controlDict_.lookup("timeFormat")); @@ -347,13 +361,45 @@ bool Foam::Time::writeObject timeDict.regIOobject::writeObject(fmt, ver, cmp); bool writeOK = objectRegistry::writeObject(fmt, ver, cmp); - if (writeOK && purgeWrite_) + if (writeOK) { - previousOutputTimes_.push(tmName); - - while (previousOutputTimes_.size() > purgeWrite_) + // Does primary or secondary time trigger purging? + // Note that primary times can only be purged by primary + // purging. Secondary times can be purged by either primary + // or secondary purging. + if (primaryOutputTime_ && purgeWrite_) { - rmDir(objectRegistry::path(previousOutputTimes_.pop())); + previousOutputTimes_.push(tmName); + + while (previousOutputTimes_.size() > purgeWrite_) + { + rmDir(objectRegistry::path(previousOutputTimes_.pop())); + } + } + if + ( + !primaryOutputTime_ + && secondaryOutputTime_ + && secondaryPurgeWrite_ + ) + { + // Writing due to secondary + previousSecondaryOutputTimes_.push(tmName); + + while + ( + previousSecondaryOutputTimes_.size() + > secondaryPurgeWrite_ + ) + { + rmDir + ( + objectRegistry::path + ( + previousSecondaryOutputTimes_.pop() + ) + ); + } } } @@ -368,6 +414,7 @@ bool Foam::Time::writeObject bool Foam::Time::writeNow() { + primaryOutputTime_ = true; outputTime_ = true; return write(); } diff --git a/src/OpenFOAM/db/Time/TimeState.C b/src/OpenFOAM/db/Time/TimeState.C index 500ca47d43..f3e3740107 100644 --- a/src/OpenFOAM/db/Time/TimeState.C +++ b/src/OpenFOAM/db/Time/TimeState.C @@ -37,7 +37,9 @@ Foam::TimeState::TimeState() deltaT0_(0), deltaTchanged_(false), outputTimeIndex_(0), + primaryOutputTime_(false), secondaryOutputTimeIndex_(0), + secondaryOutputTime_(false), outputTime_(false) {} diff --git a/src/OpenFOAM/db/Time/TimeState.H b/src/OpenFOAM/db/Time/TimeState.H index d721529480..b055d439f0 100644 --- a/src/OpenFOAM/db/Time/TimeState.H +++ b/src/OpenFOAM/db/Time/TimeState.H @@ -61,8 +61,14 @@ protected: bool deltaTchanged_; label outputTimeIndex_; + //- Is outputTime because of primary? + bool primaryOutputTime_; + label secondaryOutputTimeIndex_; - bool outputTime_; + //- Is outputTime because of secondary? + bool secondaryOutputTime_; + + bool outputTime_; public: @@ -112,7 +118,7 @@ public: // Check - //- Return true if this is an output time + //- Return true if this is an output time (primary or secondary) bool outputTime() const; }; diff --git a/src/engine/Make/options b/src/engine/Make/options index 6862a106f6..0929e2bc8f 100644 --- a/src/engine/Make/options +++ b/src/engine/Make/options @@ -2,12 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ - -I$(LIB_SRC)/fvMotionSolver/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/fvMotionSolver/lnInclude LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -ldynamicMesh \ - -lfvMotionSolvers \ - -lsampling + -lfvMotionSolvers diff --git a/src/fileFormats/Make/files b/src/fileFormats/Make/files index 7845ac9312..37f3bc0098 100644 --- a/src/fileFormats/Make/files +++ b/src/fileFormats/Make/files @@ -2,4 +2,17 @@ vtk/vtkUnstructuredReader.C nas/NASCore.C starcd/STARCDCore.C +coordSet/coordSet.C + +setWriters = sampledSetWriters + +$(setWriters)/writers.C +$(setWriters)/ensight/ensightSetWriterRunTime.C +$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C +$(setWriters)/jplot/jplotSetWriterRunTime.C +$(setWriters)/raw/rawSetWriterRunTime.C +$(setWriters)/vtk/vtkSetWriterRunTime.C +$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C +$(setWriters)/csv/csvSetWriterRunTime.C + LIB = $(FOAM_LIBBIN)/libfileFormats diff --git a/src/sampling/sampledSet/coordSet/coordSet.C b/src/fileFormats/coordSet/coordSet.C similarity index 97% rename from src/sampling/sampledSet/coordSet/coordSet.C rename to src/fileFormats/coordSet/coordSet.C index fed58fc86f..d8b37c5fdd 100644 --- a/src/sampling/sampledSet/coordSet/coordSet.C +++ b/src/fileFormats/coordSet/coordSet.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/coordSet/coordSet.H b/src/fileFormats/coordSet/coordSet.H similarity index 97% rename from src/sampling/sampledSet/coordSet/coordSet.H rename to src/fileFormats/coordSet/coordSet.H index 8629f78bbe..5492f37b43 100644 --- a/src/sampling/sampledSet/coordSet/coordSet.H +++ b/src/fileFormats/coordSet/coordSet.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/csv/csvSetWriter.C rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.C index 4cbb51a597..c1ed54b1cd 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.C +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriter.H b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/csv/csvSetWriter.H rename to src/fileFormats/sampledSetWriters/csv/csvSetWriter.H index 9c494320cb..8e4b9c7d70 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriter.H +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C index 2d326f8efa..ac588e3957 100644 --- a/src/sampling/sampledSet/writers/csv/csvSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/csv/csvSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C similarity index 99% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.C rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C index d481a41532..4b874e201d 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.C +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriter.H rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H index 5118c85faa..14a735b2ed 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriter.H +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C index b987035b33..c529cb02e4 100644 --- a/src/sampling/sampledSet/writers/ensight/ensightSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/ensight/ensightSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C similarity index 97% rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C index f6198d3f5a..2679e1e702 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.C +++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,6 @@ License \*---------------------------------------------------------------------------*/ #include "gnuplotSetWriter.H" -#include "clock.H" #include "coordSet.H" #include "fileName.H" #include "OFstream.H" diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H index 88e9414c85..74688771e8 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriter.H +++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C index 90ee219888..4e57426359 100644 --- a/src/sampling/sampledSet/writers/gnuplot/gnuplotSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/gnuplot/gnuplotSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C similarity index 97% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.C rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C index 98dc34bad9..d71d860a26 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.C +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriter.H rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H index bd7bc8c783..5b09456642 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriter.H +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C index e0e9ac2b52..7e54146fe7 100644 --- a/src/sampling/sampledSet/writers/jplot/jplotSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/jplot/jplotSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C similarity index 97% rename from src/sampling/sampledSet/writers/raw/rawSetWriter.C rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.C index e259c78eaa..403b9e7111 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriter.C +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriter.H b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/raw/rawSetWriter.H rename to src/fileFormats/sampledSetWriters/raw/rawSetWriter.H index 418549d01b..89c857d779 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriter.H +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C index c4376c9140..92a8a83354 100644 --- a/src/sampling/sampledSet/writers/raw/rawSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/raw/rawSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.C rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C index b865e704d4..3ab2736175 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.C +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriter.H rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H index 9507fd1dc7..21bd80ef1e 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriter.H +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C index 3c30764d86..e9320e5b55 100644 --- a/src/sampling/sampledSet/writers/vtk/vtkSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/vtk/vtkSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/writer.C b/src/fileFormats/sampledSetWriters/writer.C similarity index 99% rename from src/sampling/sampledSet/writers/writer.C rename to src/fileFormats/sampledSetWriters/writer.C index 69dbdec6fe..e031615ff6 100644 --- a/src/sampling/sampledSet/writers/writer.C +++ b/src/fileFormats/sampledSetWriters/writer.C @@ -166,7 +166,6 @@ void Foam::writer::write { valueSetPtrs[i] = &valueSets[i]; } - write(points, valueSetNames, valueSetPtrs, os); } diff --git a/src/sampling/sampledSet/writers/writer.H b/src/fileFormats/sampledSetWriters/writer.H similarity index 100% rename from src/sampling/sampledSet/writers/writer.H rename to src/fileFormats/sampledSetWriters/writer.H diff --git a/src/sampling/sampledSet/writers/writers.C b/src/fileFormats/sampledSetWriters/writers.C similarity index 96% rename from src/sampling/sampledSet/writers/writers.C rename to src/fileFormats/sampledSetWriters/writers.C index 2815bcda03..4bcc1b39b2 100644 --- a/src/sampling/sampledSet/writers/writers.C +++ b/src/fileFormats/sampledSetWriters/writers.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/writers.H b/src/fileFormats/sampledSetWriters/writers.H similarity index 97% rename from src/sampling/sampledSet/writers/writers.H rename to src/fileFormats/sampledSetWriters/writers.H index 3adaab13fa..601e7bcd16 100644 --- a/src/sampling/sampledSet/writers/writers.H +++ b/src/fileFormats/sampledSetWriters/writers.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C similarity index 98% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C index 9cc44a10c3..3825868196 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.C +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H similarity index 97% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H index 8e8dc67ead..47c3628936 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriter.H +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C similarity index 94% rename from src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C rename to src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C index 8e7ab61c8e..583855fc83 100644 --- a/src/sampling/sampledSet/writers/xmgrace/xmgraceSetWriterRunTime.C +++ b/src/fileFormats/sampledSetWriters/xmgrace/xmgraceSetWriterRunTime.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options index fa13513b50..29e4469610 100644 --- a/src/fvMotionSolver/Make/options +++ b/src/fvMotionSolver/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ LIB_LIBS = \ @@ -11,4 +11,5 @@ LIB_LIBS = \ -lmeshTools \ -ldynamicMesh \ -lfiniteVolume \ + -lfileFormats /*-lforces include in controlDict if needed */ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 34a2babd73..0d7eb0e13b 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -17,8 +17,7 @@ EXE_INC = \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \ - -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/dynamicFvMesh/lnInclude LIB_LIBS = \ -lfiniteVolume \ @@ -42,5 +41,4 @@ LIB_LIBS = \ -lincompressibleTransportModels \ -lregionModels \ -lsurfaceFilmModels \ - -ldynamicFvMesh \ - -lsampling + -ldynamicFvMesh diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index 0ee4f07bb0..d37a26a9dd 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude @@ -14,6 +14,7 @@ LIB_LIBS = \ -lfiniteVolume \ -llagrangian \ -lmeshTools \ + -lfileFormats \ -ledgeMesh \ -lsurfMesh \ -ltriSurface \ diff --git a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C index 2890577c24..26a40327d6 100644 --- a/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C +++ b/src/mesh/autoMesh/autoHexMesh/meshRefinement/meshRefinement.C @@ -2295,13 +2295,6 @@ void Foam::meshRefinement::dumpIntersections(const fileName& prefix) const } } - // Convert to vtk format - string cmd - ( - "objToVTK " + prefix + "_edges.obj " + prefix + "_edges.vtk > /dev/null" - ); - system(cmd.c_str()); - Pout<< endl; } diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index ac717c7516..1b22dab2a0 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,6 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/triSurface/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/fileFormats/lnInclude LIB_LIBS = \ - -ltriSurface + -ltriSurface \ + -lfileFormats diff --git a/src/postProcessing/functionObjects/IO/Make/options b/src/postProcessing/functionObjects/IO/Make/options index 5166bcc9e3..a3ae8da833 100644 --- a/src/postProcessing/functionObjects/IO/Make/options +++ b/src/postProcessing/functionObjects/IO/Make/options @@ -1,9 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/meshTools/lnInclude LIB_LIBS = \ -lfiniteVolume \ - -lmeshTools \ - -lsampling + -lmeshTools diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options index d7c5f944c6..e95ea37c78 100644 --- a/src/postProcessing/functionObjects/field/Make/options +++ b/src/postProcessing/functionObjects/field/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ @@ -11,6 +12,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -llagrangian \ + -lfileFormats \ -lsampling \ -lincompressibleTransportModels \ -lcompressibleTurbulenceModel \ diff --git a/src/postProcessing/functionObjects/forces/Make/options b/src/postProcessing/functionObjects/forces/Make/options index afc10fb1aa..5952c6b6cb 100644 --- a/src/postProcessing/functionObjects/forces/Make/options +++ b/src/postProcessing/functionObjects/forces/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ @@ -17,4 +17,4 @@ LIB_LIBS = \ -lcompressibleLESModels \ -lfiniteVolume \ -lmeshTools \ - -lsampling + -lfileFormats diff --git a/src/postProcessing/functionObjects/jobControl/Make/options b/src/postProcessing/functionObjects/jobControl/Make/options index 5166bcc9e3..e69de29bb2 100644 --- a/src/postProcessing/functionObjects/jobControl/Make/options +++ b/src/postProcessing/functionObjects/jobControl/Make/options @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling diff --git a/src/postProcessing/functionObjects/systemCall/Make/options b/src/postProcessing/functionObjects/systemCall/Make/options index 5166bcc9e3..e69de29bb2 100644 --- a/src/postProcessing/functionObjects/systemCall/Make/options +++ b/src/postProcessing/functionObjects/systemCall/Make/options @@ -1,9 +0,0 @@ -EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude - -LIB_LIBS = \ - -lfiniteVolume \ - -lmeshTools \ - -lsampling diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options index 61fc018ad9..71b7873964 100644 --- a/src/randomProcesses/Make/options +++ b/src/randomProcesses/Make/options @@ -1,7 +1,5 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -lsampling + -lfiniteVolume diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options index 4eaef77e23..28569ccda6 100644 --- a/src/regionModels/regionCoupling/Make/options +++ b/src/regionModels/regionCoupling/Make/options @@ -1,6 +1,5 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index 2c0e2cf57c..21a54595be 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -3,7 +3,6 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ -I$(LIB_SRC)/AMIInterpolation/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/sampling/Make/files b/src/sampling/Make/files index 8c5227dbf2..ef0415f0f2 100644 --- a/src/sampling/Make/files +++ b/src/sampling/Make/files @@ -5,7 +5,6 @@ probes/probesFunctionObject/probesFunctionObject.C sampledSet/circle/circleSet.C sampledSet/cloud/cloudSet.C -sampledSet/coordSet/coordSet.C sampledSet/patchCloud/patchCloudSet.C sampledSet/polyLine/polyLineSet.C sampledSet/face/faceOnlySet.C @@ -20,17 +19,6 @@ sampledSet/triSurfaceMeshPointSet/triSurfaceMeshPointSet.C sampledSet/uniform/uniformSet.C sampledSet/array/arraySet.C -setWriters = sampledSet/writers - -$(setWriters)/writers.C -$(setWriters)/ensight/ensightSetWriterRunTime.C -$(setWriters)/gnuplot/gnuplotSetWriterRunTime.C -$(setWriters)/jplot/jplotSetWriterRunTime.C -$(setWriters)/raw/rawSetWriterRunTime.C -$(setWriters)/vtk/vtkSetWriterRunTime.C -$(setWriters)/xmgrace/xmgraceSetWriterRunTime.C -$(setWriters)/csv/csvSetWriterRunTime.C - cuttingPlane/cuttingPlane.C sampledSurface/sampledPatch/sampledPatch.C diff --git a/src/sampling/Make/options b/src/sampling/Make/options index 3fbc509d54..23e6bc81a7 100644 --- a/src/sampling/Make/options +++ b/src/sampling/Make/options @@ -2,6 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ + -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/conversion/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude @@ -10,6 +11,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lsurfMesh \ + -lfileFormats \ -ltriSurface \ -llagrangian \ -lconversion diff --git a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C index e01429fc88..e43dc5757f 100644 --- a/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C +++ b/src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriterTemplates.C @@ -25,6 +25,7 @@ License #include "OFstream.H" #include "IOmanip.H" +#include "OSspecific.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index dd54a756c6..84ca3cdf5d 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -35,7 +35,6 @@ SourceFiles #ifndef surfaceWriter_H #define surfaceWriter_H -#include "volFields.H" #include "typeInfo.H" #include "autoPtr.H" #include "pointField.H"