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

Timestamp:

07/05/11 16:47:23 (14 years ago)

Author:

Eric.Larour

Message:

Modified API for modules, to take into account new constraint applications, without nodesets

File:

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

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

@@ -11 +11 @@
         Vec         uf         = NULL;
         Vec         ys         = NULL;
-        NodeSets   *nodesets   = NULL;
+        Nodes*      nodes   = 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();
                 _error_(" usage. See above");
@@ -28 +29 @@
         FetchData(&uf,UF);
         FetchData(&ys,YS);
-        FetchNodeSets(&nodesets,NODESETS);
+        FetchData((DataSet**)&nodes,NODES);
+        FetchParams(&parameters,PARAMETERS);
 
         /*!Reduce vector: */
-        if (nrhs==3){
-                Mergesolutionfromftogx(&ug, uf,ys,nodesets);
+        if (nrhs==4){
+                Mergesolutionfromftogx(&ug, uf,ys,nodes,parameters);
         }
         else{
                 FetchData(&flag_ys0,YSFLAG);
-                Mergesolutionfromftogx(&ug, uf,ys,nodesets,flag_ys0);
+                Mergesolutionfromftogx(&ug, uf,ys,nodes,parameters,flag_ys0);
         }
 
@@ -46 +48 @@
         VecFree(&ug);
         VecFree(&ys);
-        delete nodesets;
+        delete nodes;
+        delete parameters;
 
         /*end module: */
@@ -55 +58 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [ug] = %s(uf,ys,nodesets,[flag_ys0]);\n",__FUNCT__);
+        _printf_(true,"   usage: [ug] = %s(uf,ys,nodes,parameters,[flag_ys0]);\n",__FUNCT__);
         _printf_(true,"\n");
 }