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

Rmoved the capillary pressure-based error criteria from simulators

Browse Source
This commit is contained in:
James McClure
2014-08-10 11:20:48 -04:00
parent a5ec9be888
commit 456dd10edb
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/BasicSimulator.cpp
View File

@@ -1186,6 +1186,13 @@ int main(int argc, char **argv)
InitDenColor(ID, Den, Phi, das, dbs, Nx, Ny, Nz);
#endif
//.......................................................................
sprintf(LocalRankString,"%05d",rank);
// sprintf(LocalRankFilename,"%s%s","ID.",LocalRankString);
// WriteLocalSolidID(LocalRankFilename, id, N);
sprintf(LocalRankFilename,"%s%s","SignDist.",LocalRankString);
WriteLocalSolidDistance(LocalRankFilename, SignDist.data, N);
//.......................................................................
if (Restart == true){
if (rank==0) printf("Reading restart file! \n");
// Read in the restart file to CPU buffers
@@ -1205,12 +1212,7 @@ int main(int argc, char **argv)
//......................................................................
for (i=0; i<N; i++) SignDist.data[i] -= (1.0); //
//.......................................................................
sprintf(LocalRankString,"%05d",rank);
// sprintf(LocalRankFilename,"%s%s","ID.",LocalRankString);
// WriteLocalSolidID(LocalRankFilename, id, N);
sprintf(LocalRankFilename,"%s%s","SignDist.",LocalRankString);
WriteLocalSolidDistance(LocalRankFilename, SignDist.data, N);
//.......................................................................
//...........................................................................
// Gradient of the Signed Distance function
@@ -2340,8 +2342,6 @@ int main(int argc, char **argv)
fprintf(TIMELOG,"%.5g %.5g %.5g %.5g ",trawn_global, trJwn_global, trRwn_global, pc_global); // Trimmed curvature
fprintf(TIMELOG,"%.5g %.5g %.5g\n",Fx, Fy, Fz); // External force
fflush(TIMELOG);
if (timestep > 100) err = (pan_global - paw_global)*D/(5.796*alpha) - Jwn_global*D;
}
}
}