Skip to content

Commit bf0197f

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

File tree

30 files changed

+300
-158
lines changed

30 files changed

+300
-158
lines changed

‎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),

‎src/PostprocessData/postprocessData/postprocessData.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class postprocessData
8585
/// this constructor is used when postprocesing is active
8686
/// during simulation.
8787
/// @param control const reference to systemControl
88-
postprocessData(const systemControl& control, timeValue startTime = -1.0);
88+
postprocessData(const systemControl& control, TimeValueType startTime = -1.0);
8989

9090
~postprocessData()override = default;
9191

‎src/phasicFlow/containers/span/span.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class span
5555

5656
mutable T* data_ = nullptr;
5757

58-
index size_ = 0;
58+
IndexType size_ = 0;
5959

6060
public:
6161

@@ -104,7 +104,7 @@ class span
104104

105105
/// Returns the number of elements in the span
106106
INLINE_FUNCTION_HD
107-
index size() const
107+
IndexType size() const
108108
{
109109
return size_;
110110
}
@@ -139,14 +139,14 @@ class span
139139

140140
/// Returns a reference to the element at the specified index
141141
INLINE_FUNCTION_HD
142-
T& operator[](index i)
142+
T& operator[](IndexType i)
143143
{
144144
return data_[i];
145145
}
146146

147147
/// Returns a const reference to the element at the specified index
148148
INLINE_FUNCTION_HD
149-
T& operator[](index i)const
149+
T& operator[](IndexType i)const
150150
{
151151
return data_[i];
152152
}

‎src/phasicFlow/repository/Time/baseTimeControl.cpp

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,21 @@
2323

2424
void pFlow::baseTimeControl::setTimeControl
2525
(
26-
timeValue startTime,
27-
timeValue endTime,
28-
timeValue interval,
26+
TimeValueType startTime,
27+
TimeValueType endTime,
28+
TimeValueType interval,
2929
const word &intervalPrefix
3030
)
3131
{
3232
isTimeStep_ = false;
3333
intervalPrefix_ = intervalPrefix;
34-
rRange_ = stridedRange<timeValue>(startTime, endTime, interval);
34+
rRange_ = stridedRange<TimeValueType>(startTime, endTime, interval);
3535
}
3636

3737
pFlow::baseTimeControl::baseTimeControl(
3838
const dictionary &dict,
3939
const word &intervalPrefix,
40-
timeValue defStartTime)
40+
TimeValueType defStartTime)
4141
: intervalPrefix_(intervalPrefix)
4242
{
4343
auto tControl = dict.getVal<word>("timeControl");
@@ -59,10 +59,10 @@ pFlow::baseTimeControl::baseTimeControl(
5959

6060
if(!isTimeStep_)
6161
{
62-
auto startTime = (dict.getValOrSet<timeValue>("startTime", defStartTime));
63-
auto endTime = (dict.getValOrSet<timeValue>("endTime", largeValue));
64-
auto interval = dict.getVal<timeValue>(intervalWord);
65-
rRange_ = stridedRange<timeValue>(startTime, endTime, interval);
62+
auto startTime = (dict.getValOrSet<TimeValueType>("startTime", defStartTime));
63+
auto endTime = (dict.getValOrSet<TimeValueType>("endTime", largeValue));
64+
auto interval = dict.getVal<TimeValueType>(intervalWord);
65+
rRange_ = stridedRange<TimeValueType>(startTime, endTime, interval);
6666

6767
}
6868
else
@@ -78,9 +78,9 @@ pFlow::baseTimeControl::baseTimeControl(
7878
pFlow::baseTimeControl::baseTimeControl
7979
(
8080
const dictionary& dict,
81-
const timeValue defInterval,
81+
const TimeValueType defInterval,
8282
const word& intervalPrefix,
83-
const timeValue defStartTime
83+
const TimeValueType defStartTime
8484
)
8585
:
8686
intervalPrefix_(intervalPrefix)
@@ -104,10 +104,10 @@ pFlow::baseTimeControl::baseTimeControl
104104

105105
if(!isTimeStep_)
106106
{
107-
auto startTime = (dict.getValOrSet<timeValue>("startTime", defStartTime));
108-
auto endTime = (dict.getValOrSet<timeValue>("endTime", largeValue));
109-
auto interval = dict.getValOrSet<timeValue>(intervalWord, defInterval);
110-
rRange_ = stridedRange<timeValue>(startTime, endTime, interval);
107+
auto startTime = (dict.getValOrSet<TimeValueType>("startTime", defStartTime));
108+
auto endTime = (dict.getValOrSet<TimeValueType>("endTime", largeValue));
109+
auto interval = dict.getValOrSet<TimeValueType>(intervalWord, defInterval);
110+
rRange_ = stridedRange<TimeValueType>(startTime, endTime, interval);
111111

112112
}
113113
else
@@ -131,9 +131,9 @@ pFlow::baseTimeControl::baseTimeControl(int32 start, int32 end, int32 stride, co
131131

132132
pFlow::baseTimeControl::baseTimeControl
133133
(
134-
timeValue start,
135-
timeValue end,
136-
timeValue stride,
134+
TimeValueType start,
135+
TimeValueType end,
136+
TimeValueType stride,
137137
const word &intervalPrefix
138138
)
139139
:
@@ -147,7 +147,7 @@ pFlow::baseTimeControl::baseTimeControl
147147
{
148148
}
149149

150-
bool pFlow::baseTimeControl::eventTime(uint32 iter, timeValue t, timeValue dt) const
150+
bool pFlow::baseTimeControl::eventTime(uint32 iter, TimeValueType t, TimeValueType dt) const
151151
{
152152
if(isTimeStep_)
153153
{
@@ -166,7 +166,7 @@ bool pFlow::baseTimeControl::eventTime(const timeInfo &ti) const
166166
}
167167

168168
bool
169-
pFlow::baseTimeControl::isInRange(uint32 iter, timeValue t, timeValue dt) const
169+
pFlow::baseTimeControl::isInRange(uint32 iter, TimeValueType t, TimeValueType dt) const
170170
{
171171
if(isTimeStep_)
172172
{
@@ -178,7 +178,7 @@ pFlow::baseTimeControl::isInRange(uint32 iter, timeValue t, timeValue dt) const
178178
}
179179
}
180180

181-
pFlow::timeValue
181+
pFlow::TimeValueType
182182
pFlow::baseTimeControl::startTime() const
183183
{
184184
if(!isTimeStep_)
@@ -191,7 +191,7 @@ pFlow::baseTimeControl::startTime() const
191191
return 0;
192192
}
193193

194-
pFlow::timeValue
194+
pFlow::TimeValueType
195195
pFlow::baseTimeControl::endTime() const
196196
{
197197
if(!isTimeStep_)
@@ -204,7 +204,7 @@ pFlow::baseTimeControl::endTime() const
204204
return 0;
205205
}
206206

207-
pFlow::timeValue
207+
pFlow::TimeValueType
208208
pFlow::baseTimeControl::rInterval() const
209209
{
210210
if(!isTimeStep_)

0 commit comments

Comments
 (0)