extra protocol checks
This commit is contained in:
@@ -92,6 +92,8 @@ int main( int argc, char **argv )
|
||||
SKIP_TIMESTEPS = flow_db->getWithDefault<int>( "skip_timesteps", 50000 );
|
||||
ENDPOINT_THRESHOLD = flow_db->getWithDefault<double>( "endpoint_threshold", 0.1);
|
||||
/* protocol specific key values */
|
||||
if (PROTOCOL == "image sequence" || PROTOCOL == "core flooding")
|
||||
SKIP_TIMESTEPS = 0;
|
||||
if (PROTOCOL == "fractional flow")
|
||||
FRACTIONAL_FLOW_INCREMENT = flow_db->getWithDefault<double>( "fractional_flow_increment", 0.05);
|
||||
if (PROTOCOL == "seed water")
|
||||
@@ -107,10 +109,14 @@ int main( int argc, char **argv )
|
||||
runAnalysis analysis(ColorModel);
|
||||
while (ContinueSimulation){
|
||||
/* this will run steady points */
|
||||
timestep += MAX_STEADY_TIME;
|
||||
if (PROTOCOL == "fractional flow" || PROTOCOL == "seed water" || PROTOCOL == "shell aggregation" || PROTOCOL == "image sequence" )
|
||||
timestep += MAX_STEADY_TIME;
|
||||
else
|
||||
timestep += ColorModel.timestepMax;
|
||||
/* Run the simulation timesteps*/
|
||||
MLUPS = ColorModel.Run(timestep);
|
||||
if (rank==0) printf("Lattice update rate (per MPI process)= %f MLUPS \n", MLUPS);
|
||||
if (ColorModel.timestep > ColorModel.timestepMax){
|
||||
if (ColorModel.timestep >= ColorModel.timestepMax){
|
||||
ContinueSimulation = false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user