OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added changes to lbpm_color_simulator and lbpm_nondarcy_simulator made on OLCF

Browse Source
This commit is contained in:
James E McClure
2016-11-25 15:23:45 -05:00
parent d486289a30
commit 16dc811dd7
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/lbpm_color_simulator.cpp
View File

@@ -584,7 +584,7 @@ int main(int argc, char **argv)
}
else{
printf("WARNING:No Restart.txt file, setting timestep=0 \n");
timestep=0;
timestep=5;
}
}
MPI_Bcast(&timestep,1,MPI_INT,0,comm);

12
tests/lbpm_nondarcy_simulator.cpp
View File

@@ -96,7 +96,7 @@ int main(int argc, char **argv)
/*
* Set simulation parameters internally
*/
tau=1.f;
tau=0.7;
Fx = 0.f;
Fy = 0.f;
Fz = 1.0e-7;
@@ -401,6 +401,9 @@ int main(int argc, char **argv)
}
Re = 0.f;
if (rank==0) printf("D32 Fx Fy Fz vx vy vz err1d Fo Re K err\n");
// Generate a bunch of points until sufficiently high Re is obtained
while (Re < REYNOLDS_NUMBER){
// Increase the external force and simulate to steady state
@@ -444,13 +447,8 @@ int main(int argc, char **argv)
timestep++;
if (rank==0){
// write out csv file
printf("D32 Fx Fy Fz vx vy vz err1d Fo Re K err\n");
}
if (timestep%500 == 0){
if (timestep%500 == 0){
//...........................................................................
// Copy the data for for the analysis timestep
//...........................................................................
// Copy the phase from the GPU -> CPU