forked from martinjrobins/SPH-DEM
-
Notifications
You must be signed in to change notification settings - Fork 1
/
sphIncompress.cpp
executable file
·266 lines (230 loc) · 9.01 KB
/
sphIncompress.cpp
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
#include "sphIncompress.h"
void CsphIncompress::start() {
data->traverse<driftRAndKick,ifSphOrSphBoundary>();
#ifdef LIQ_DEM
data->traverse<driftR,ifDem>();
#endif
#ifdef SLK
data->globals.slkIndex0++;
data->globals.slkIndexLast++;
if (data->globals.slkIndex0>=SLK_NUM_TIMESTEPS) data->globals.slkIndex0 = 0;
if (data->globals.slkIndexLast>=SLK_NUM_TIMESTEPS) data->globals.slkIndexLast = 0;
#endif
data->traverse<driftRest,ifSphOrSphBoundary>();
data->globals.time += data->globals.dt/2;
//if ((data->globals.sphStep < DAMP_STEPS)||(data->globals.sphStep%REINIT_DENS_EVERY_N_STEPS==0)) {
if ((data->globals.sphStep%REINIT_DENS_EVERY_N_STEPS==0)||(data->globals.sphStep == REINIT_DENS_AT_N_STEPS)) {
data->reset();
#ifdef MY_VAR_RES
data->neighboursGroup<calcGradVLeastSquares,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<vect,readGradV0,writeGradV0>();
data->syncParticlesBetweenProcs<vect,readGradV1,writeGradV1>();
//data->syncParticlesBetweenProcs<vect,readGradV2,writeGradV2>();
#endif
//if (data->globals.mpiRank==0) cout<<"\tRe-initialising density...sphStep="<<data->globals.sphStep<<endl;
for (int i=0;i<10;i++) {
data->traverse<calcHFromDens,ifSphOrSphBoundaryOrGhost>();
data->syncParticlesBetweenProcs<double,readH,writeH>();
data->neighboursGroup<calcDensity,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<double,readDens,writeDens>();
}
}
data->traverse<initSumsMiddle,ifSphOrSphBoundary>();
}
void CsphIncompress::middle() {
data->globals.newDt = data->globals.maxdt;
#ifdef SMOOTHED_VISC_VELOCITY
data->reset(SMOOTH_HFAC_MULT);
data->findBothNeighbours<ifSph>();
#endif
#ifdef SPH_SMOOTHING
data->reset(SMOOTH_HFAC_MULT);
data->findBothNeighbours<ifSph>();
#endif
#ifdef GRID_SMOOTHING
data->reset();
#endif
#ifndef SMOOTHING
//cout <<"rank = "<<data->globals.mpiRank<<"before reset "<<endl;
data->reset();
//cout <<"rank = "<<data->globals.mpiRank<<"after reset "<<endl;
#endif
timeval t1,t2;
gettimeofday(&t1,NULL);
#ifdef LIQ_DEM
/*
data->traverse<initPorosityAndDrag,ifSphOrSphBoundaryOrGhost>();
data->neighboursGroupCoupling<calcPorosity,ifDem>();
data->reverseSyncParticlesBetweenProcs<double,readPorosity,sumPorosity>();
data->reverseSyncParticlesBetweenProcs<double,read_dPorositydt,sum_dPorositydt>();
data->neighboursGroupAtRadius<finalisePorosity,ifSphOrSphBoundary>(LIQ_DEM_COUPLING_RADIUS);
//data->neighboursGroup<finalisePorosity,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<double,readPorosity,writePorosity>();
data->traverse<setPorosityForBoundary,ifBoundary>();
*/
#ifdef LIQ_DEM_SEPARATE_DRAGS
data->neighboursGroupCoupling<calcPorosityAndDrag3,ifSphOrSphBoundary>();
#else
data->neighboursGroupCoupling<calcPorosityAndDrag2,ifSphOrSphBoundary>();
#endif
data->traverse<finalisePorosity2,ifSphOrSphBoundary>();
//data->neighboursGroupAtRadius<finalisePorosity,ifSphOrSphBoundary>(LIQ_DEM_COUPLING_RADIUS);
data->traverse<setPorosityForBoundary,ifBoundary>();
//data->syncParticlesBetweenProcs<double,readPorosity,writePorosity>();
#ifdef VAR_H_CORRECTION2
/*
data->traverse<initGradH,ifSphOrSphBoundaryOrDemOrGhost>();
data->neighboursGroupCoupling<calcGradPorosity,ifDem>();
data->reverseSyncParticlesBetweenProcs<vect,readGradH,sumGradH>();
*/
data->neighboursGroupCoupling<calcGradPorosity2,ifSphOrSphBoundary>();
#endif
#ifdef CONST_H
//data->traverse<calcHFromPorosity,ifSphOrSphBoundaryOrGhost>();
//data->reset();
#endif
//data->syncParticlesBetweenProcs<double,readH,writeH>();
//data->neighboursGroup<calcDensity,ifSphOrSphBoundary>();
//data->traverse<calcHFromPorosity,ifSphOrSphBoundaryOrGhost>();
//data->syncParticlesBetweenProcs<double,readDens,writeDens>();
/*
data->neighboursGroupCoupling<calcPorosityAndDrag2,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<double,readPorosity,writePorosity>();
*/
#endif
#ifdef CORRECTED_GRADIENT
data->neighboursGroup<calcInvM,ifSphOrSphBoundary>();
#endif
#ifdef VAR_H_CORRECTION
data->neighboursGroup<calcOmega,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<double,readOmega,writeOmega>();
#endif
#ifdef VAR_H_CORRECTION2
#ifdef LIQ_DEM
data->traverse<finaliseGradH,ifSphOrSphBoundary>();
#else
data->neighboursGroup<calcGradH,ifSphOrSphBoundary>();
#endif
data->syncParticlesBetweenProcs<vect,readGradH,writeGradH>();
#endif
data->traverse<calcPressSpsoundPdr2,ifSphOrSphBoundaryOrGhost>();
#ifdef SLK
data->neighboursGroup<calcGLeastSquares,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<vectTensor,readG,writeG>();
#endif
#ifdef SMOOTHED_VISC_VELOCITY
data->neighboursGroupScaled<smoothViscV,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<vect,readViscV,writeViscV>();
#endif
//cout <<"rank = "<<data->globals.mpiRank<<"before force "<<endl;
data->neighbours<calcForce,ifSphOrSphBoundary>();
//cout <<"rank = "<<data->globals.mpiRank<<"after force"<<endl;
#ifdef BACKGROUND_PRESSURE_FORCE
data->traverse<addBackgroundPressure,ifSphOrSphBoundary>();
#endif
#ifdef LIQ_DEM
#ifdef LIQ_DEM_TEST
data->traverse<addGradPorosityTerm,ifSph>();
#endif
data->globals.newDt = min(data->globals.newDt,liqDemCondition());
#ifndef FIXED_DEM
#ifndef NO_DEM_CONTACTS
if (data->globals.time > TIME_DROP_PARTICLE) {
data->globals.newDt = min(data->globals.newDt,demCondition());
}
#endif
#endif
#endif
data->traverse<accelCondition,ifSphOrDem>();
gettimeofday(&t2,NULL);
data->globals.wtTotalForceCalc.tv_sec += t2.tv_sec-t1.tv_sec;
data->globals.wtTotalForceCalc.tv_usec += t2.tv_usec-t1.tv_usec;
double oldDt = data->globals.dt;
if (data->globals.dt == 0.0) {
if (data->globals.mpiRank==0) cout << "I think that this is the first timestep, reinitiallizing dt...."<<endl;
data->globals.dt = data->globals.newDt;
} else {
//data->globals.dt = 2.0*data->globals.newDt - data->globals.dt;
//data->globals.dt = data->globals.newDt*data->globals.dt/(2.0*data->globals.dt-data->globals.newDt);
data->globals.dt = data->globals.newDt;
}
data->setGlobalTimestep(data->globals.dt);
//data->neighboursGroup<calcVort,ifSphOrSphBoundary>();
data->traverse<kick,ifSphOrSphBoundary>(0.5*oldDt,0.5*data->globals.dt);
data->traverse<initSumsEnd,ifSphOrSphBoundary>();
#ifdef LIQ_DEM
data->traverse<driftRAndKick,ifDem>();
data->traverse<initSumsMiddle,ifDem>();
#endif
}
void CsphIncompress::end() {
#ifndef SMOOTHING
data->traverse<driftR,ifSphOrSphBoundary>();
#endif
#ifdef SLK
data->globals.slkIndex0++;
data->globals.slkIndexLast++;
if (data->globals.slkIndex0>=SLK_NUM_TIMESTEPS) data->globals.slkIndex0 = 0;
if (data->globals.slkIndexLast>=SLK_NUM_TIMESTEPS) data->globals.slkIndexLast = 0;
#endif
data->globals.time += data->globals.dt/2;
data->reset();
#ifdef CORRECTED_GRADIENT
data->neighboursGroup<calcInvM,ifSphOrSphBoundary>();
#endif
#ifdef VAR_H_CORRECTION
data->neighboursGroup<calcOmega,ifSphOrSphBoundary>();
#endif
#ifdef VAR_H_CORRECTION2
#ifdef LIQ_DEM
data->neighboursGroupCoupling<calcGradPorosity2,ifSphOrSphBoundary>();
data->traverse<finaliseGradH,ifSphOrSphBoundary>();
#else
data->neighboursGroup<calcGradH,ifSphOrSphBoundary>();
#endif
data->syncParticlesBetweenProcs<vect,readGradH,writeGradH>();
#endif
#ifdef LIQ_DEM_DDDT_VER2
data->neighboursGroupCoupling<calcPorosity2,ifSphOrSphBoundary>();
data->traverse<finalisePorosity2,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<double,readPorosity,writePorosity>();
data->syncParticlesBetweenProcs<double,read_dPorositydt,write_dPorositydt>();
#endif
timeval t1,t2;
gettimeofday(&t1,NULL);
#ifdef SLK
data->neighboursGroup<calcGLeastSquares,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<vectTensor,readG,writeG>();
#endif
data->neighbours<calcDddtDudt,ifSphOrSphBoundary>();
#ifdef LIQ_DEM
//data->traverse<correctDddt,ifSphOrSphBoundary>();
data->syncParticlesBetweenProcs<vect,readF,writeF>();
data->syncParticlesBetweenProcs<vect,readFb,writeFb>();
data->syncParticlesBetweenProcs<vect,readFp,writeFp>();
data->syncParticlesBetweenProcs<vect,readFv,writeFv>();
data->neighboursGroupCoupling<calcFPI,ifDem>();
#ifndef FIXED_DEM
#ifndef NO_DEM_CONTACTS
data->neighboursGroup<calcDEMContacts,ifDem>();
#ifndef LIQ_DEM_CUSTOM_WALL_CONTACTS
data->neighboursGroup<calcDEMWallContacts,ifDem>();
#endif
#endif
#endif
#ifdef DEM_BLOCK
vect avForce;
avForce = 0.0;
data->globals.tmp = 0;
data->traverse<vect,calcAvForce,ifDem>(avForce);
avForce = avForce/data->globals.tmp;
data->traverse<vect,setAvForce,ifDem>(avForce);
#endif
data->traverse<kick,ifDem>(0.5*data->globals.dt,0.5*data->globals.dt);
#endif
gettimeofday(&t2,NULL);
data->globals.wtTotalDddtCalc.tv_sec += t2.tv_sec-t1.tv_sec;
data->globals.wtTotalDddtCalc.tv_usec += t2.tv_usec-t1.tv_usec;
data->traverse<driftRest,ifSphOrSphBoundary>();
data->traverse<calcEnergies,ifSphOrSphBoundary>();
}