Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inc/owPhysicsFluidSimulator.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ class owPhysicsFluidSimulator
void makeSnapshot();

private:
struct timeval simulation_start;
time_t simulation_start;
owOpenCLSolver *ocl_solver;
float *position_cpp; // everywhere in the code %variableName%_cpp means that we create
float *velocity_cpp; // and initialize in 'ordinary' memory some data, which will be
Expand Down
3 changes: 2 additions & 1 deletion src/owConfigProperty.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
#include <stdio.h>

owConfigProperty::owConfigProperty(int argc, char **argv)
: numOfElasticP(0), numOfLiquidP(0), numOfBoundaryP(0), numOfMembranes(0),
: numOfElasticP(0), numOfLiquidP(0), numOfBoundaryP(0), numOfMembranes(0),
simulation(nullptr),
MUSCLE_COUNT(96), logStep(10), path("./configuration/"),
loadPath("./buffers/"), sourceFileName(OPENCL_PROGRAM_PATH) {
prefDeviceType = ALL;
Expand Down
14 changes: 8 additions & 6 deletions src/owPhysicsFluidSimulator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,16 @@
* @param dev_type
* defines preferable device type for current configuration
*/
owPhysicsFluidSimulator::owPhysicsFluidSimulator(owHelper *helper, int argc,
char **argv) {
owPhysicsFluidSimulator::owPhysicsFluidSimulator(owHelper* helper, int argc,
char** argv)
: position_cpp(nullptr), velocity_cpp(nullptr), density_cpp(nullptr), particleIndex_cpp(nullptr),
elasticConnectionsData_cpp(nullptr), muscle_activation_signal_cpp(nullptr), membraneData_cpp(nullptr),
config(nullptr) {
// int generateInitialConfiguration = 1;//1 to generate initial configuration,
// 0 - load from file

try {
gettimeofday(&simulation_start, NULL);
simulation_start = time(nullptr);
iterationCount = 0;
config = new owConfigProperty(argc, argv);
// LOAD FROM FILE
Expand Down Expand Up @@ -363,9 +366,8 @@ double owPhysicsFluidSimulator::simulationStep(const bool load_to) {
std::cout << ", t in sim: " << iterationCount * config->getTimeStep()
<< "s) dt: " << config->getTimeStep() << " (in s)";

struct timeval current_time;
gettimeofday(&current_time, NULL);
float elapsed_seconds = (float)(current_time.tv_sec - simulation_start.tv_sec);
time_t current_time = time(NULL);
float elapsed_seconds = (float)(current_time - simulation_start);
float time_elapsed = elapsed_seconds / 60.0;
std::string time_elapsed_unit = "(in min)";
if (time_elapsed > 60.0) {
Expand Down