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

Merge branch 'master' of github.com:JamesEMcClure/LBPM-WIA

Browse Source
This commit is contained in:
James McClure 2021-07-22 18:30:31 -04:00
commit fc2c98467d
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tests/lbpm_color_simulator.cpp
View File

@ -34,15 +34,15 @@ int main( int argc, char **argv )
// Load the input database // Load the input database
auto db = std::make_shared<Database>( argv[1] ); auto db = std::make_shared<Database>( argv[1] );
if (argc > 2) { if (argc > 2) {
SimulationMode = "development"; SimulationMode = "legacy";
} }
if ( rank == 0 ) { if ( rank == 0 ) {
printf( "********************************************************\n" ); printf( "********************************************************\n" );
printf( "Running Color LBM \n" ); printf( "Running Color LBM \n" );
printf( "********************************************************\n" ); printf( "********************************************************\n" );
if (SimulationMode == "development") if (SimulationMode == "legacy")
printf("**** DEVELOPMENT MODE ENABLED *************\n"); printf("**** LEGACY MODE ENABLED *************\n");
} }
// Initialize compute device // Initialize compute device
int device = ScaLBL_SetDevice( rank ); int device = ScaLBL_SetDevice( rank );
@ -66,13 +66,16 @@ int main( int argc, char **argv )
// structure and allocate variables // structure and allocate variables
ColorModel.Initialize(); // initializing the model will set initial conditions for variables ColorModel.Initialize(); // initializing the model will set initial conditions for variables
if (SimulationMode == "development"){ if (SimulationMode == "legacy"){
ColorModel.Run();
}
else {
double MLUPS=0.0; double MLUPS=0.0;
int timestep = 0; int timestep = 0;
bool ContinueSimulation = true; bool ContinueSimulation = true;
/* Variables for simulation protocols */ /* Variables for simulation protocols */
auto PROTOCOL = ColorModel.color_db->getWithDefault<std::string>( "protocol", "none" ); auto PROTOCOL = ColorModel.color_db->getWithDefault<std::string>( "protocol", "default" );
/* image sequence protocol */ /* image sequence protocol */
int IMAGE_INDEX = 0; int IMAGE_INDEX = 0;
int IMAGE_COUNT = 0; int IMAGE_COUNT = 0;
@ -123,6 +126,7 @@ int main( int argc, char **argv )
else{ else{
if (rank==0) printf("Finished simulating image sequence \n"); if (rank==0) printf("Finished simulating image sequence \n");
ColorModel.timestep = ColorModel.timestepMax; ColorModel.timestep = ColorModel.timestepMax;
ContinueSimulation = false;
} }
} }
/*********************************************************/ /*********************************************************/
@ -144,7 +148,7 @@ int main( int argc, char **argv )
double speedB = sqrt(vB_x*vB_x + vB_y*vB_y + vB_z*vB_z); double speedB = sqrt(vB_x*vB_x + vB_y*vB_y + vB_z*vB_z);
/* stop simulation if previous point was sufficiently close to the endpoint*/ /* stop simulation if previous point was sufficiently close to the endpoint*/
if (volA*speedA < ENDPOINT_THRESHOLD*volB*speedB) ContinueSimulation = false; if (volA*speedA < ENDPOINT_THRESHOLD*volB*speedB) ContinueSimulation = false;
if (ContinueSimulation){ if (ContinueSimulation && SKIP_TIMESTEPS > 0 ){
while (skip_time < SKIP_TIMESTEPS && fabs(SaturationChange) < fabs(FRACTIONAL_FLOW_INCREMENT) ){ while (skip_time < SKIP_TIMESTEPS && fabs(SaturationChange) < fabs(FRACTIONAL_FLOW_INCREMENT) ){
timestep += ANALYSIS_INTERVAL; timestep += ANALYSIS_INTERVAL;
if (PROTOCOL == "fractional flow") { if (PROTOCOL == "fractional flow") {
@ -173,8 +177,7 @@ int main( int argc, char **argv )
/*********************************************************/ /*********************************************************/
} }
} }
else
ColorModel.Run();
PROFILE_STOP( "Main" ); PROFILE_STOP( "Main" );
auto file = db->getWithDefault<std::string>( "TimerFile", "lbpm_color_simulator" ); auto file = db->getWithDefault<std::string>( "TimerFile", "lbpm_color_simulator" );