Skip to content

Commit bf0197f

Browse files
change in the type name of timeValue and sample dictionaries for settingsDict and domain
1 parent ab856e1 commit bf0197f

30 files changed

Lines changed: 300 additions & 158 deletions

File tree

DEMSystems/DEMSystem/DEMSystem.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class DEMSystem
9696
return Control_();
9797
}
9898

99-
auto inline constexpr usingDoulle()const
99+
auto inline constexpr usingDouble()const
100100
{
101101
return pFlow::usingDouble__;
102102
}

src/Interaction/sphereInteraction/sphereInteraction/sphereInteraction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ bool pFlow::sphereInteraction<cFM,gMM, cLT>::hearChanges
359359
if(msg.equivalentTo(message::ITEMS_REARRANGE))
360360
{
361361
notImplementedFunction;
362-
return false;
362+
return true;
363363
}
364364

365365
fatalErrorInFunction<<"Event "<< msg.eventNames()<<

src/PostprocessData/fieldsDataBase/fieldsDataBase.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ pFlow::postprocessData::fieldsDataBase::fieldsDataBase
467467
systemControl& control,
468468
const dictionary& postDict,
469469
bool inSimulation,
470-
timeValue startTime
470+
TimeValueType startTime
471471
)
472472
:
473473
time_(control.time()),
@@ -492,7 +492,7 @@ pFlow::postprocessData::fieldsDataBase::fieldsDataBase
492492
}
493493
}
494494

495-
pFlow::timeValue pFlow::postprocessData::fieldsDataBase::currentTime() const
495+
pFlow::TimeValueType pFlow::postprocessData::fieldsDataBase::currentTime() const
496496
{
497497
return time_.currentTime();
498498
}
@@ -914,7 +914,7 @@ pFlow::uniquePtr<pFlow::postprocessData::fieldsDataBase>
914914
systemControl& control,
915915
const dictionary& postDict,
916916
bool inSimulation,
917-
timeValue startTime
917+
TimeValueType startTime
918918
)
919919
{
920920
word dbType;

src/PostprocessData/fieldsDataBase/fieldsDataBase.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class fieldsDataBase
7878
anyList allFields_;
7979

8080
/// Map to store the last capture time of each field
81-
wordMap<timeValue> captureTime_;
81+
wordMap<TimeValueType> captureTime_;
8282

8383
/// Reference to the Time object
8484
Time& time_;
@@ -178,7 +178,7 @@ class fieldsDataBase
178178
systemControl& control,
179179
const dictionary& postDict,
180180
bool inSimulation,
181-
timeValue startTime);
181+
TimeValueType startTime);
182182

183183
/// no copy constructor
184184
fieldsDataBase(const fieldsDataBase&) = delete;
@@ -203,15 +203,15 @@ class fieldsDataBase
203203
systemControl& control,
204204
const dictionary& postDict,
205205
bool inSimulation,
206-
timeValue startTime
206+
TimeValueType startTime
207207
),
208208
(control, postDict, inSimulation, startTime)
209209
);
210210

211211

212212
// - Public Access Functions
213213
/// returns the current time
214-
timeValue currentTime()const;
214+
TimeValueType currentTime()const;
215215

216216
/// const ref to object Time
217217
const Time& time()const
@@ -282,7 +282,7 @@ class fieldsDataBase
282282
/// Get the next avaiable time folder after the current time folder
283283
/// This is only used for post-simulation processing
284284
virtual
285-
timeValue getNextTimeFolder()const
285+
TimeValueType getNextTimeFolder()const
286286
{
287287
return -1.0;
288288
}
@@ -291,7 +291,7 @@ class fieldsDataBase
291291
/// This is used only for post-simulation processing
292292
/// @returns the time value of the next folder.
293293
virtual
294-
timeValue setToNextTimeFolder()
294+
TimeValueType setToNextTimeFolder()
295295
{
296296
return -1.0;
297297
}
@@ -300,7 +300,7 @@ class fieldsDataBase
300300
/// This is used only for post-simulation processing
301301
/// @returns the time value of the skipped folder
302302
virtual
303-
timeValue skipNextTimeFolder()
303+
TimeValueType skipNextTimeFolder()
304304
{
305305
return -1.0;
306306
}
@@ -316,7 +316,7 @@ class fieldsDataBase
316316
systemControl& control,
317317
const dictionary& postDict,
318318
bool inSimulation,
319-
timeValue startTime);
319+
TimeValueType startTime);
320320
};
321321

322322
} // namespace pFlow::postprocessData

src/PostprocessData/fieldsDataBase/simulationFieldsDataBase.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pFlow::postprocessData::simulationFieldsDataBase::simulationFieldsDataBase
4949
systemControl &control,
5050
const dictionary& postDict,
5151
bool inSimulation,
52-
timeValue startTime
52+
TimeValueType startTime
5353
)
5454
:
5555
fieldsDataBase(control, postDict, inSimulation, startTime),

src/PostprocessData/fieldsDataBase/simulationFieldsDataBase.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class simulationFieldsDataBase
6060
systemControl& control,
6161
const dictionary& postDict,
6262
bool inSimulation,
63-
timeValue startTime);
63+
TimeValueType startTime);
6464

6565
~simulationFieldsDataBase() override = default;
6666

src/PostprocessData/operation/includeMask/IncludeMask.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ class IncludeMask
8686
word fieldName_;
8787

8888
/// Timestamp when mask was last updated (-1 indicates never updated)
89-
timeValue lastUpdated_ = -1;
89+
TimeValueType lastUpdated_ = -1;
9090

9191
/// Updates the mask based on current field values if needed, returns true if successful
9292
bool updateMask()
9393
{
94-
timeValue t = database().currentTime();
94+
TimeValueType t = database().currentTime();
9595

9696
if( equal( t, lastUpdated_)) return true;
9797

@@ -206,11 +206,11 @@ class IncludeMask<T,allOp<T>>
206206

207207
std::vector<bool> mask_;
208208

209-
timeValue lastUpdated_ = -1;
209+
TimeValueType lastUpdated_ = -1;
210210

211211
bool updateMask()
212212
{
213-
timeValue t = database().currentTime();
213+
TimeValueType t = database().currentTime();
214214

215215
if( equal( t, lastUpdated_)) return true;
216216

src/PostprocessData/operation/postprocessOperation/postprocessOperationFunctions.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ inline
4646
bool writeField
4747
(
4848
iOstream& os,
49-
timeValue t,
49+
TimeValueType t,
5050
const regionField<T> field,
5151
uint32 threshold,
5252
const T& defValue=T{}

src/PostprocessData/postprocessComponent/particleProbePostprocessComponent/particleProbePostprocessComponent.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ template<typename T>
5252
inline bool writeField
5353
(
5454
iOstream& os,
55-
timeValue t,
55+
TimeValueType t,
5656
const regionField<T>& field,
5757
const regionPoints& regPoints,
5858
const T& invalidVal = T{}

src/PostprocessData/postprocessData/postprocessData.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
pFlow::postprocessData::postprocessData::postprocessData
2828
(
2929
const systemControl &control,
30-
timeValue startTime
30+
TimeValueType startTime
3131
)
3232
:
3333
auxFunctions(control),

0 commit comments

Comments
 (0)