Changeset 22758 for issm/trunk/src/c/classes/Inputs/DatasetInput.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Inputs/DatasetInput.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

issm/trunk/src/c/classes/Inputs/DatasetInput.cpp

@@ -167 +167 @@
         /*Get requested input within dataset*/
         for(int i=0;i<this->numids;i++) if(this->ids[i]==id) offset=i;
-        if(offset<0) _error_("Could not find input of id "<<id );
+        if(offset<0) _error_("Could not find input of id "<<id<<" (Enum: "<<EnumToStringx(id)<<")" );
 
         Input* input=xDynamicCast<Input*>(this->inputs->GetObjectByOffset(offset));

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod