Skip to content

Commit

Permalink
switch command option in cases to default
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiangyu-Hu committed Sep 6, 2023
1 parent 751280b commit 86dede8
Show file tree
Hide file tree
Showing 20 changed files with 22 additions and 30 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ int main(int ac, char *av[])
/** Tag for running particle relaxation for the initially body-fitted distribution */
sph_system.setRunParticleRelaxation(false);
/** Tag for starting with relaxed body-fitted particles distribution */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
//----------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion tests/2d_examples/test_2d_collision/collision.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int main(int ac, char *av[])
/** Tag for running particle relaxation for the initially body-fitted distribution */
sph_system.setRunParticleRelaxation(false);
/** Tag for starting with relaxed body-fitted particles distribution */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
//----------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main(int ac, char *av[])
// Tag for run particle relaxation for the initial body fitted distribution.
sph_system.setRunParticleRelaxation(false);
// Tag for computation start with relaxed body fitted particles distribution.
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
// Handle command line arguments and override the tags for particle relaxation and reload.
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main(int ac, char *av[])
/** Tag for run particle relaxation for the initial body fitted distribution. */
sph_system.setRunParticleRelaxation(false);
/** Tag for computation start with relaxed body fitted particles distribution. */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
// handle command line arguments
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main(int ac, char *av[])
/** Tag for run particle relaxation for the initial body fitted distribution. */
sph_system.setRunParticleRelaxation(false);
/** Tag for computation start with relaxed body fitted particles distribution. */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
/** handle command line arguments. */
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ int main(int ac, char *av[])
/** Tag for run particle relaxation for the initial body fitted distribution. */
sph_system.setRunParticleRelaxation(false);
/** Tag for computation start with relaxed body fitted particles distribution. */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
/** handle command line arguments. */
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
Expand Down Expand Up @@ -260,6 +260,5 @@ int main(int ac, char *av[])
tt = t4 - t1 - interval;
std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
3 changes: 1 addition & 2 deletions tests/2d_examples/test_2d_fsi2/fsi2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ int main(int ac, char *av[])
//----------------------------------------------------------------------
SPHSystem sph_system(system_domain_bounds, resolution_ref);
sph_system.setRunParticleRelaxation(false); // Tag for run particle relaxation for body-fitted distribution
sph_system.setReloadParticles(true); // Tag for computation with save particles distribution
sph_system.setReloadParticles(false); // Tag for computation with save particles distribution
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av); // handle command line arguments
#endif
Expand Down Expand Up @@ -302,6 +302,5 @@ int main(int ac, char *av[])
write_beam_tip_displacement.testResult();
}


return 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int main(int ac, char *av[])
//----------------------------------------------------------------------
SPHSystem sph_system(system_domain_bounds, resolution_ref);
/** Tag for running particle relaxation for the initially body-fitted distribution */
sph_system.setRunParticleRelaxation(true);
sph_system.setRunParticleRelaxation(false);
/** Tag for starting with relaxed body-fitted particles distribution */
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
Expand Down Expand Up @@ -303,6 +303,5 @@ int main(int ac, char *av[])
tt = t4 - t1 - interval;
std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ int main(int ac, char *av[])
/** Tag for run particle relaxation for the initial body fitted distribution. */
system.setRunParticleRelaxation(false);
/** Tag for computation start with relaxed body fitted particles distribution. */
system.setReloadParticles(true);
system.setReloadParticles(false);
system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(system);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ int main(int ac, char *av[])
/** Tag for running particle relaxation for the initially body-fitted distribution */
sph_system.setRunParticleRelaxation(false);
/** Tag for starting with relaxed body-fitted particles distribution */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
//----------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,8 @@ int main(int ac, char *av[])
// SPHSystem section
//----------------------------------------------------------------------
SPHSystem sph_system(system_domain_bounds, dp_0);
sph_system.setRunParticleRelaxation(true); // Tag for run particle relaxation for body-fitted distribution
sph_system.setReloadParticles(true); // Tag for computation with save particles distribution
sph_system.setRunParticleRelaxation(false); // Tag for run particle relaxation for body-fitted distribution
sph_system.setReloadParticles(false); // Tag for computation with save particles distribution
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av); // handle command line arguments
#endif
Expand Down Expand Up @@ -544,6 +544,5 @@ int main(int ac, char *av[])
tt = t4 - t1 - interval;
std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ int main(int ac, char *av[])
SPHSystem sph_system(system_domain_bounds, dp_0);
GlobalStaticVariables::physical_time_ = 0.0;
Real mechanical_time_ = 0.0;
sph_system.setRunParticleRelaxation(true); // Tag for run particle relaxation for body-fitted distribution
sph_system.setReloadParticles(true); // Tag for computation with save particles distribution
sph_system.setRunParticleRelaxation(false); // Tag for run particle relaxation for body-fitted distribution
sph_system.setReloadParticles(false); // Tag for computation with save particles distribution
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av); // handle command line arguments
#endif
Expand Down Expand Up @@ -357,6 +357,5 @@ int main(int ac, char *av[])

std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ int main(int ac, char *av[])
/** Tag for run particle relaxation for the initial body fitted distribution. */
sph_system.setRunParticleRelaxation(false);
/** Tag for reload initially relaxed particles. */
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
// handle command line arguments
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av);
Expand Down Expand Up @@ -354,6 +354,5 @@ int main(int ac, char *av[])
tt = t4 - t1 - interval;
std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
2 changes: 1 addition & 1 deletion tests/3d_examples/test_3d_self_contact/3d_self_contact.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ int main(int ac, char *av[])
// Tag for run particle relaxation for the initial body fitted distribution.
sph_system.setRunParticleRelaxation(false);
// Tag for reload initially relaxed particles.
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
#ifdef BOOST_AVAILABLE
// handle command line arguments
sph_system.handleCommandlineOptions(ac, av);
Expand Down
2 changes: 1 addition & 1 deletion tests/3d_examples/test_3d_taylor_bar/taylor_bar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ int main(int ac, char *av[])
/** Setup the system. Please the make sure the global domain bounds are correctly defined. */
SPHSystem sph_system(system_domain_bounds, particle_spacing_ref);
sph_system.setRunParticleRelaxation(false);
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
#ifdef BOOST_AVAILABLE
sph_system.handleCommandlineOptions(ac, av);
#endif
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ int main(int ac, char *av[])
// Tag for run particle relaxation for the initial body fitted distribution.
sph_system.setRunParticleRelaxation(false);
// Tag for computation start with relaxed body fitted particles distribution.
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
// Handle command line arguments and override the tags for particle relaxation and reload.
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ int main(int ac, char *av[])
//----------------------------------------------------------------------
SPHSystem sph_system(system_domain_bounds, particle_spacing_ref);
/** Tag for run particle relaxation for the initial body fitted distribution. */
sph_system.setRunParticleRelaxation(true);
sph_system.setRunParticleRelaxation(false);
/** Tag for computation start with relaxed body fitted particles distribution. */
sph_system.setReloadParticles(false);
// handle command line arguments
Expand Down Expand Up @@ -287,6 +287,5 @@ int main(int ac, char *av[])
tt = t4 - t1 - interval;
std::cout << "Total wall time for computation: " << tt.seconds() << " seconds." << std::endl;


return 0;
}
2 changes: 1 addition & 1 deletion tests/user_examples/test_2d_stretching/stretching.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ int main(int ac, char *av[])
/** Tag for running particle relaxation for the initially body-fitted distribution */
system.setRunParticleRelaxation(false);
/** Tag for starting with relaxed body-fitted particles distribution */
system.setReloadParticles(true);
system.setReloadParticles(false);
system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(system);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ int main(int ac, char *av[])
BoundingBox system_domain_bounds(Vec2d(-BW, -BW), Vec2d(DL + BW, DH + BW));
SPHSystem sph_system(system_domain_bounds, particle_spacing_ref);
sph_system.setRunParticleRelaxation(false);
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
GlobalStaticVariables::physical_time_ = 0.0;
IOEnvironment io_environment(sph_system);
Expand Down
3 changes: 1 addition & 2 deletions tests/user_examples/test_3d_repose_angle/repose_angle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ int main(int ac, char *av[])
BoundingBox system_domain_bounds(Vecd(-BW, -BW, -BW), Vecd(DL + BW, DH + BW, DW + BW));
SPHSystem sph_system(system_domain_bounds, resolution_ref);
sph_system.setRunParticleRelaxation(false);
sph_system.setReloadParticles(true);
sph_system.setReloadParticles(false);
sph_system.handleCommandlineOptions(ac, av);
IOEnvironment io_environment(sph_system);
//----------------------------------------------------------------------
Expand Down Expand Up @@ -284,6 +284,5 @@ int main(int ac, char *av[])
write_soil_mechanical_energy.testResult();
}


return 0;
}

0 comments on commit 86dede8

Please sign in to comment.