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

Timestamp:

09/07/10 12:02:39 (15 years ago)

Author:

Mathieu Morlighem

Message:

Clean up of solutions (verbose in modules)

File:

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

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

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