diff --git a/bin/mpirunDebug b/bin/mpirunDebug
index a7a0cb32b0965d88704fdcf8e88186e3a90ea092..7911e06e98639c6620ea4fd705293cb9c6057d9d 100755
--- a/bin/mpirunDebug
+++ b/bin/mpirunDebug
@@ -100,10 +100,10 @@ echo "run $args" > $PWD/gdbCommands
echo "where" >> $PWD/gdbCommands
echo "Constructed gdb initialization file $PWD/gdbCommands"
-$ECHO "Choose running method: 0)normal 1)gdb+xterm 2)gdb 3)log 4)log+xterm 5)xterm+valgrind: \c"
+$ECHO "Choose running method: 0)normal 1)gdb+xterm 2)gdb 3)log 4)log+xterm 5)xterm+valgrind 6)gperftools(callgrind): \c"
read method
case "$method" in
-0 | 1 | 2 | 3 | 4 | 5 )
+0 | 1 | 2 | 3 | 4 | 5 | 6)
# okay
;;
*)
@@ -199,6 +199,11 @@ do
echo "$sourceFoam; cd $PWD; valgrind $exec $args; read dummy" >> $procCmdFile
echo "${node}xterm -font fixed -title 'processor'$proc $geom -e $procCmdFile" >> $PWD/mpirun.schema
;;
+ 6)
+ echo "$sourceFoam; cd $PWD; CPUPROFILE=log.profiler_$proc $exec $args; \
+ pprof --callgrind $exec log.profiler_$proc > log.profiler_$proc.callgrind;" >> $procCmdFile
+ echo "${node}$procCmdFile" >> $PWD/mpirun.schema
+ ;;
esac
chmod +x $procCmdFile
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index 19a6c2b321ffa576f876a1f6ad321f896e06fcb6..155c4c2eb48456ef366aa43b7de061321f16dca6 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -79,21 +79,35 @@ Foam::word Foam::Time::controlDictName("controlDict");
void Foam::Time::adjustDeltaT()
{
+ bool adjustTime = false;
+ scalar timeToNextWrite = VGREAT;
+
if (writeControl_ == wcAdjustableRunTime)
{
- scalar interval = writeInterval_;
- if (secondaryWriteControl_ == wcAdjustableRunTime)
- {
- interval = min(interval, secondaryWriteInterval_);
- }
-
-
- scalar timeToNextWrite = max
+ adjustTime = true;
+ timeToNextWrite = max
+ (
+ 0.0,
+ (outputTimeIndex_ + 1)*writeInterval_ - (value() - startTime_)
+ );
+ }
+ if (secondaryWriteControl_ == wcAdjustableRunTime)
+ {
+ adjustTime = true;
+ timeToNextWrite = max
(
0.0,
- (outputTimeIndex_ + 1)*interval - (value() - startTime_)
+ min
+ (
+ timeToNextWrite,
+ (secondaryOutputTimeIndex_ + 1)*secondaryWriteInterval_
+ - (value() - startTime_)
+ )
);
+ }
+ if (adjustTime)
+ {
scalar nSteps = timeToNextWrite/deltaT_ - SMALL;
// For tiny deltaT the label can overflow!
@@ -1130,10 +1144,10 @@ Foam::Time& Foam::Time::operator++()
/ secondaryWriteInterval_
);
- if (outputIndex > outputTimeIndex_)
+ if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
- outputTimeIndex_ = outputIndex;
+ secondaryOutputTimeIndex_ = outputIndex;
}
}
break;
@@ -1145,10 +1159,10 @@ Foam::Time& Foam::Time::operator++()
returnReduce(elapsedCpuTime(), maxOp<double>())
/ secondaryWriteInterval_
);
- if (outputIndex > outputTimeIndex_)
+ if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
- outputTimeIndex_ = outputIndex;
+ secondaryOutputTimeIndex_ = outputIndex;
}
}
break;
@@ -1160,10 +1174,10 @@ Foam::Time& Foam::Time::operator++()
returnReduce(label(elapsedClockTime()), maxOp<label>())
/ secondaryWriteInterval_
);
- if (outputIndex > outputTimeIndex_)
+ if (outputIndex > secondaryOutputTimeIndex_)
{
outputTime_ = true;
- outputTimeIndex_ = outputIndex;
+ secondaryOutputTimeIndex_ = outputIndex;
}
}
break;
diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C
index 00f1beefbea514c52e671fef38c9ddfc8d96c744..6a80618404ef323e9b9a2d1cfa79fed6fd1e75ae 100644
--- a/src/OpenFOAM/db/Time/TimeIO.C
+++ b/src/OpenFOAM/db/Time/TimeIO.C
@@ -51,6 +51,8 @@ void Foam::Time::readDict()
}
scalar oldWriteInterval = writeInterval_;
+ scalar oldSecondaryWriteInterval = secondaryWriteInterval_;
+
if (controlDict_.readIfPresent("writeInterval", writeInterval_))
{
if (writeControl_ == wcTimeStep && label(writeInterval_) < 1)
@@ -124,6 +126,26 @@ void Foam::Time::readDict()
break;
}
}
+ if (oldSecondaryWriteInterval != secondaryWriteInterval_)
+ {
+ switch (secondaryWriteControl_)
+ {
+ case wcRunTime:
+ case wcAdjustableRunTime:
+ // Recalculate secondaryOutputTimeIndex_ to be in units of
+ // current writeInterval.
+ secondaryOutputTimeIndex_ = label
+ (
+ secondaryOutputTimeIndex_
+ * oldSecondaryWriteInterval
+ / secondaryWriteInterval_
+ );
+ break;
+
+ default:
+ break;
+ }
+ }
if (controlDict_.readIfPresent("purgeWrite", purgeWrite_))
{
diff --git a/src/OpenFOAM/db/Time/TimeState.C b/src/OpenFOAM/db/Time/TimeState.C
index b02b87bbfc1d9734c434f9a12f777b7684e6292c..500ca47d43ffb35c6d761886b1741dfd8dc6bf6e 100644
--- a/src/OpenFOAM/db/Time/TimeState.C
+++ b/src/OpenFOAM/db/Time/TimeState.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
@@ -37,6 +37,7 @@ Foam::TimeState::TimeState()
deltaT0_(0),
deltaTchanged_(false),
outputTimeIndex_(0),
+ secondaryOutputTimeIndex_(0),
outputTime_(false)
{}
diff --git a/src/OpenFOAM/db/Time/TimeState.H b/src/OpenFOAM/db/Time/TimeState.H
index 1c59ca85a3d4a84e1e6831a9c9512243664062d3..d721529480ea79ce2de2b9f4cca74875ea11502b 100644
--- a/src/OpenFOAM/db/Time/TimeState.H
+++ b/src/OpenFOAM/db/Time/TimeState.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
@@ -61,9 +61,9 @@ protected:
bool deltaTchanged_;
label outputTimeIndex_;
+ label secondaryOutputTimeIndex_;
bool outputTime_;
-
public:
// Constructors
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index f44ffe3a6b7eb7bcc317d4709fa46acbb4af42c4..b7e11d644fed2cc622e40beeb174e453c05c0d48 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -398,6 +398,8 @@ Foam::string& Foam::stringOps::inplaceExpand
begVar - stringStart + 1,
varValue
);
+
+ begVar = stringStart+varValue.size();
}
else
{
@@ -744,8 +746,7 @@ Foam::string& Foam::stringOps::inplaceExpand
FatalErrorIn
(
"stringOps::inplaceExpand(string&, const bool)"
- )
- << "Unknown variable name '" << varName << "'"
+ ) << "Unknown variable name '" << varName << "'"
<< exit(FatalError);
}
}
diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
index 828ee0e710c3c8c6f595226ec424a4c2f0a858b2..8bcd9c6270a22ae42ce171a63d8f50000919204e 100644
--- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
+++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriverFeature.C
@@ -2655,7 +2655,6 @@ Foam::vectorField Foam::autoSnapDriver::calcNearestSurfaceFeature
}
// Remove any meshed faces
- PackedBoolList ppFaces(mesh.nFaces());
forAll(pp.addressing(), i)
{
label meshFaceI = pp.addressing()[i];