Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WriteState] minor fix with the time attribute, default values #776

Merged
merged 2 commits into from
Oct 3, 2018
Merged

[WriteState] minor fix with the time attribute, default values #776

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a178fb4
olivier-goury Sep 14, 2018
f0351f1
olivier-goury Sep 20, 2018
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
19 changes: 11 additions & 8 deletions modules/SofaExporter/WriteState.inl
View file
Original file line number Diff line number Diff line change
@@ -47,7 +47,7 @@ WriteState::WriteState()
, d_writeV( initData(&d_writeV, false, "writeV", "flag enabling output of V vector"))
, d_writeF( initData(&d_writeF, false, "writeF", "flag enabling output of F vector"))
, d_time( initData(&d_time, helper::vector<double>(0), "time", "set time to write outputs (by default export at t=0)"))
, d_period( initData(&d_period, 0.0, "period", "period between outputs"))
, d_period( initData(&d_period, this->getContext()->getDt(), "period", "period between outputs"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this default initialization really working ?
if not, this should definitely go in the init() function

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this initialization may seem strange but it works.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can go in the init too, but then the isSet() method called on period returns true.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's a good point that you do. And the value is correctly initialized ? (using the specified time step value)

Copy link
Contributor

@damienmarchal damienmarchal Sep 19, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well ... I let Olivier answer :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad. Actually, we saw with Damien that "this->getContext()->getDt()" before the context is really defined returns always 0.01, no matter what the real dt is! I tested it with dt=0.01 so I thought this was working fine. I will fix this now!

, d_DOFsX( initData(&d_DOFsX, helper::vector<unsigned int>(0), "DOFsX", "set the position DOFs to write"))
, d_DOFsV( initData(&d_DOFsV, helper::vector<unsigned int>(0), "DOFsV", "set the velocity DOFs to write"))
, d_stopAt( initData(&d_stopAt, 0.0, "stopAt", "stop the simulation when the given threshold is reached"))
@@ -81,7 +81,7 @@ WriteState::~WriteState()
void WriteState::init()
{
validInit = true;
periodicExport = false;
periodicExport = true;
mmodel = this->getContext()->getMechanicalState();

// test the size and range of the DOFs to write in the file output
@@ -126,6 +126,7 @@ void WriteState::init()
d_filename.setValue(" defaultExportFile");
}


//check period
if(d_period.isSet())
{
@@ -157,14 +158,14 @@ void WriteState::init()
{
msg_warning() << "starting export time ("<< d_time.getValue()[0] <<") is too low regarding the time step ("<< dt <<")";
}
periodicExport = true;
}


//check time
if(!d_time.isSet())
{
msg_warning() << "an export time should be specified"
<< "by default, export at t=0";
<< "by default, export at t=0.0";
helper::vector<double>& timeVector = *d_time.beginEdit();
timeVector.clear();
timeVector.resize(1);
@@ -195,14 +196,16 @@ void WriteState::init()
}

//check that the desired export times will be met with the chosen time step
double mutiple = fmod(d_time.getValue()[i],dt);
int integerM = (int) mutiple;
mutiple -= (double)integerM;
if(mutiple > std::numeric_limits<double>::epsilon())
double nbDtInTime = d_time.getValue()[i]/dt;
int intnbDtInTime = (int) nbDtInTime;
double rest = nbDtInTime - intnbDtInTime;
if(rest > std::numeric_limits<double>::epsilon())
{
msg_warning() << "desired export time ("<< d_time.getValue()[i] <<") can not be met with the chosen time step("<< dt <<")";
}
}
if(!d_period.isSet())
periodicExport = false;
}

//check stopAt