added check for ny > 0, due to simulation failure (#390)

* added check for ny > 0, due to possible simulation failure * moved the ny checks to model
AMICI-dev · Aug 6, 2018 · 1fc0374 · 1fc0374
1 parent 5e17a2d
commit 1fc0374
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 10 deletions.
diff --git a/src/forwardproblem.cpp b/src/forwardproblem.cpp
@@ -504,9 +504,8 @@ void ForwardProblem::getDataOutput(int it) {
 
     if (rdata->sensi >= AMICI_SENSI_ORDER_FIRST && model->nplist() > 0) {
         prepDataSensis(it);
-        if (rdata->sensi_meth == AMICI_SENSI_FSA) {
+        if (rdata->sensi_meth == AMICI_SENSI_FSA)
             getDataSensisFSA(it);
-        }
     }
 }
 
@@ -552,13 +551,11 @@ void ForwardProblem::getDataSensisFSA(int it) {
 
     model->fdsigmaydp(it, rdata, edata);
 
-    if (model->ny > 0) {
-        model->fsy(it, rdata);
-        if (edata) {
-            model->fsJy(it, dJydx, rdata);
-            model->fsres(it, rdata, edata);
-            model->fFIM(it, rdata);
-        }
+    model->fsy(it, rdata);
+    if (edata) {
+        model->fsJy(it, dJydx, rdata);
+        model->fsres(it, rdata, edata);
+        model->fFIM(it, rdata);
     }
 }
 

diff --git a/src/model.cpp b/src/model.cpp
@@ -13,6 +13,9 @@ namespace amici {
  * @param rdata pointer to return data instance
  */
 void Model::fsy(const int it, ReturnData *rdata) {
+    if (!ny)
+        return;
+
     // copy dydp for current time to sy
     std::copy(dydp.begin(), dydp.end(), &rdata->sy[it * nplist() * ny]);
 
@@ -113,7 +116,7 @@ void Model::fdJydp(const int it, const ExpData *edata,
     if (rdata->sensi_meth != AMICI_SENSI_ASA)
         return;
 
-    if(ny < 1)
+    if(!ny)
         return;
 
     for (int iJ = 0; iJ < nJ; iJ++) {
@@ -636,6 +639,9 @@ void Model::fstau(const realtype t, const int ie, const AmiVector *x, const AmiV
   * @param rdata pointer to return data instance
   */
 void Model::fy(int it, ReturnData *rdata) {
+    if (!ny)
+        return;
+
     fy(&rdata->y.at(it*ny),rdata->ts.at(it),getx(it,rdata), unscaledParameters.data(),fixedParameters.data(),h.data());
 }
 
@@ -644,6 +650,9 @@ void Model::fy(int it, ReturnData *rdata) {
      * @param rdata pointer to return data instance
      */
 void Model::fdydp(const int it, ReturnData *rdata) {
+    if (!ny)
+        return;
+
     std::fill(dydp.begin(),dydp.end(),0.0);
 
     for(int ip = 0; (unsigned)ip < plist_.size(); ip++){
@@ -663,6 +672,9 @@ void Model::fdydp(const int it, ReturnData *rdata) {
      * @param rdata pointer to return data instance
      */
 void Model::fdydx(const int it, ReturnData *rdata) {
+    if (!ny)
+        return;
+
     std::fill(dydx.begin(),dydx.end(),0.0);
     fdydx(dydx.data(),rdata->ts.at(it),getx(it,rdata), unscaledParameters.data(),fixedParameters.data(),h.data());
 }
@@ -828,6 +840,9 @@ void Model::fdeltaqB(const int ie, const realtype t, const AmiVector *x, const A
      * @param rdata pointer to return data instance
      */
 void Model::fsigmay(const int it, ReturnData *rdata, const ExpData *edata) {
+    if (!ny)
+        return;
+
     std::fill(sigmay.begin(),sigmay.end(),0.0);
     fsigmay(sigmay.data(),rdata->ts.at(it), unscaledParameters.data(),fixedParameters.data());
     for (int iytrue = 0; iytrue < nytrue; iytrue++) {
@@ -849,6 +864,9 @@ void Model::fsigmay(const int it, ReturnData *rdata, const ExpData *edata) {
      * @param edata pointer to ExpData data instance holding sigma values
      */
 void Model::fdsigmaydp(const int it, ReturnData *rdata, const ExpData *edata) {
+    if (!ny)
+        return;
+
     std::fill(dsigmaydp.begin(), dsigmaydp.end(), 0.0);
 
     for(int ip = 0; (unsigned)ip < plist_.size(); ip++)