Changeset 4228

Timestamp:

06/25/10 08:23:39 (15 years ago)

Author:

seroussi

Message:

step and time optional in InputToResult

Location:

issm/trunk/src/mex/InputToResult

Files:

• InputToResult.cpp (modified) (3 diffs)
• InputToResult.h (modified) (1 diff)

issm/trunk/src/mex/InputToResult/InputToResult.cpp

@@ -24 +24 @@
 
         /*checks on arguments on the matlab side: */
-        CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputToResultUsage);
+        //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToMeshUsage); Cant' use it here, as we have variable inputs.
+        if((nlhs!=NLHS) || (nrhs!=7 && nrhs!=9)){
+                InputToResultUsage();
+                ISSMERROR(" usage. See above");
+        }
 
         /*Input datasets: */
@@ -35 +39 @@
         
         FetchData(&enum_type,ENUMTYPE);
-        FetchData(&step,STEP);
-        FetchData(&time,TIME);
 
-        /*!Call core code: */
-        InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time);
+        if(nrhs==9){
+                FetchData(&step,STEP);
+                FetchData(&time,TIME);
+
+                /*!Call core code: */
+                InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time);
+        }
+        else{
+
+                /*!Call core code: */
+                InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type);
+        }
 
         /*write output : */
@@ -61 +73 @@
         _printf_("\n");
         _printf_("   usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type,step,time);\n",__FUNCT__);
+        _printf_("   usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type);\n",__FUNCT__);
         _printf_("\n");
 }

issm/trunk/src/mex/InputToResult/InputToResult.h

@@ -33 +33 @@
 #undef NLHS
 #define NLHS  1
-#undef NRHS
-#define NRHS  9
 
 #endif  /* _INPUTTORESULT_H */