Changeset 6579 for issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp

Timestamp:

11/15/10 13:55:06 (14 years ago)

Author:

Mathieu Morlighem

Message:

Some cleaning: parameters not needed for verbose

File:

• issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp (modified) (5 diffs)

issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp

@@ -12 +12 @@
         Vec         ys         = NULL;
         NodeSets   *nodesets   = NULL;
-        Parameters *parameters = NULL;
 
         /* output datasets: */
@@ -21 +20 @@
 
         /*checks on arguments on the matlab side: */
-        if((nlhs!=NLHS) || (nrhs!=4 && nrhs!=5)){
+        if((nlhs!=NLHS) || (nrhs!=3 && nrhs!=4)){
                 MergesolutionfromftogUsage();
                 _error_(" usage. See above");
@@ -30 +29 @@
         FetchData(&ys,YS);
         FetchNodeSets(&nodesets,NODESETS);
-        FetchParams(&parameters,PARAMETERS);
 
         /*!Reduce vector: */
-        if (nrhs==4){
-                Mergesolutionfromftogx(&ug, uf,ys,nodesets,parameters);
+        if (nrhs==3){
+                Mergesolutionfromftogx(&ug, uf,ys,nodesets);
         }
         else{
                 FetchData(&flag_ys0,YSFLAG);
-                Mergesolutionfromftogx(&ug, uf,ys,nodesets,parameters,flag_ys0);
+                Mergesolutionfromftogx(&ug, uf,ys,nodesets,flag_ys0);
         }
 
@@ -49 +47 @@
         VecFree(&ys);
         delete nodesets;
-        delete parameters;
 
         /*end module: */
@@ -58 +55 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [ug] = %s(uf,ys,nodesets,parameters);\n",__FUNCT__);
+        _printf_(true,"   usage: [ug] = %s(uf,ys,nodesets,[flag_ys0]);\n",__FUNCT__);
         _printf_(true,"\n");
 }