Changeset 6579

Timestamp:

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

Author:

Mathieu Morlighem

Message:

Some cleaning: parameters not needed for verbose

Location:

issm/trunk/src/mex

Files:

• Mergesolutionfromftog/Mergesolutionfromftog.cpp (modified) (5 diffs)
• Mergesolutionfromftog/Mergesolutionfromftog.h (modified) (2 diffs)
• Reduceload/Reduceload.cpp (modified) (5 diffs)
• Reduceload/Reduceload.h (modified) (2 diffs)
• Reduceloadfromgtof/Reduceloadfromgtof.cpp (modified) (5 diffs)
• Reduceloadfromgtof/Reduceloadfromgtof.h (modified) (2 diffs)
• Reducematrixfromgtof/Reducematrixfromgtof.cpp (modified) (4 diffs)
• Reducematrixfromgtof/Reducematrixfromgtof.h (modified) (2 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");
 }

issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.h ¶

@@ -22 +22 @@
 #define YS (mxArray*)prhs[1]
 #define NODESETS (mxArray*)prhs[2]
-#define PARAMETERS (mxArray*)prhs[3]
-#define YSFLAG (mxArray*)prhs[4]
+#define YSFLAG (mxArray*)prhs[3]
 
 /* serial output macros: */
@@ -32 +31 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  5
+#define NRHS  4
 
 #endif  /* _MERGESOLUTIONFROMFTOG_H */

issm/trunk/src/mex/Reduceload/Reduceload.cpp ¶

@@ -11 +11 @@
         Mat         Kfs        = NULL;
         Vec         ys         = NULL;
-        Parameters *parameters = NULL;
         bool        flag_ys0=false;
 
@@ -18 +17 @@
 
         /*checks on arguments on the matlab side: */
-        if((nlhs!=NLHS) || (nrhs!=4 && nrhs!=5)){
+        if((nlhs!=NLHS) || (nrhs!=3 && nrhs!=4)){
                 ReduceloadUsage();
                 _error_(" usage. See above");
@@ -27 +26 @@
         FetchData(&Kfs,KFS);
         FetchData(&ys,YS);
-        FetchParams(&parameters,PARAMETERS);
 
         /*!Reduce load from g to f size: */
-        if(nrhs==5){
+        if(nrhs==4){
                 FetchData(&flag_ys0,YSFLAG);
-                Reduceloadx(pf, Kfs, ys,parameters,flag_ys0);
+                Reduceloadx(pf, Kfs, ys,flag_ys0);
         }
         else{
-                Reduceloadx(pf, Kfs, ys,parameters);
+                Reduceloadx(pf, Kfs, ys);
         }
 
@@ -45 +43 @@
         MatFree(&Kfs);
         VecFree(&ys);
-        delete parameters;
 
         MODULEEND();
@@ -53 +50 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [pf] = %s(pf,Kfs,ys,parameters);\n",__FUNCT__);
-        _printf_(true,"          [pf] = %s(pf,Kfs,ys,parameters,ys0_flag);\n",__FUNCT__);
+        _printf_(true,"   usage: [pf] = %s(pf,Kfs,ys);\n",__FUNCT__);
+        _printf_(true,"          [pf] = %s(pf,Kfs,ys,ys0_flag);\n",__FUNCT__);
         _printf_(true,"\n");
 }

issm/trunk/src/mex/Reduceload/Reduceload.h ¶

@@ -20 +20 @@
 #define KFS (mxArray*)prhs[1]
 #define YS (mxArray*)prhs[2]
-#define PARAMETERS (mxArray*)prhs[3]
-#define YSFLAG (mxArray*)prhs[4]
+#define YSFLAG (mxArray*)prhs[3]
 
 /* serial output macros: */
@@ -30 +29 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  5
+#define NRHS  4
 
 #endif  /* _REDUCELOAD_H */

issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.cpp ¶

@@ -13 +13 @@
         Vec         ys         = NULL;
         NodeSets   *nodesets   = NULL;
-        Parameters *parameters = NULL;
 
         /* output datasets: */
@@ -22 +21 @@
 
         /*checks on arguments on the matlab side: */
-        if((nlhs!=NLHS) || (nrhs!=5 && nrhs!=6)){
+        if((nlhs!=NLHS) || (nrhs!=4 && nrhs!=5)){
                 ReduceloadfromgtofUsage();
                 _error_(" usage. See above");
@@ -32 +31 @@
         FetchData(&ys,YS);
         FetchNodeSets(&nodesets,NODESETS);
-        FetchParams(&parameters,PARAMETERS);
 
         /*!Reduce load from g to f size: */
-        if (nrhs==5){
-                Reduceloadfromgtofx(&pf, pg, Kfs, ys, nodesets,parameters);
+        if (nrhs==4){
+                Reduceloadfromgtofx(&pf, pg, Kfs, ys, nodesets);
         }
         else{
                 FetchData(&flag_ys0,YSFLAG);
-                Reduceloadfromgtofx(&pf, pg, Kfs, ys, nodesets,parameters,flag_ys0);
+                Reduceloadfromgtofx(&pf, pg, Kfs, ys, nodesets,flag_ys0);
         }
 
@@ -52 +50 @@
         VecFree(&ys);
         delete nodesets;
-        delete parameters;
 
         /*end module: */
@@ -61 +58 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [pf] = %s(pg,Kfs,ys,nodesets,parameters);\n",__FUNCT__);
+        _printf_(true,"   usage: [pf] = %s(pg,Kfs,ys,nodesets);\n",__FUNCT__);
         _printf_(true,"\n");
 }

issm/trunk/src/mex/Reduceloadfromgtof/Reduceloadfromgtof.h ¶

@@ -23 +23 @@
 #define YS (mxArray*)prhs[2]
 #define NODESETS (mxArray*)prhs[3]
-#define PARAMETERS (mxArray*)prhs[4]
-#define YSFLAG (mxArray*)prhs[5]
+#define YSFLAG (mxArray*)prhs[4]
 
 /* serial output macros: */
@@ -33 +32 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  5
+#define NRHS  4
 
 #endif  /* _REDUCELOADFROMGTOF_H */

issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.cpp ¶

@@ -10 +10 @@
         Mat         Kgg        = NULL;
         NodeSets   *nodesets   = NULL;
-        Parameters *parameters = NULL;
 
         /* output datasets: */
@@ -25 +24 @@
         FetchData(&Kgg,KGG);
         FetchNodeSets(&nodesets,NODESETS);
-        FetchParams(&parameters,PARAMETERS);
 
         /*!Reduce matrix from g to f size:*/
-        Reducematrixfromgtofx(&Kff,&Kfs,Kgg,nodesets,parameters);
+        Reducematrixfromgtofx(&Kff,&Kfs,Kgg,nodesets);
 
         /*write output datasets: */
@@ -36 +34 @@
         /*Free ressources: */
         delete nodesets;
-        delete parameters;
         MatFree(&Kgg);
         MatFree(&Kff);
@@ -48 +45 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [Kff,Kfs] = %s(Kgg,nodesets,parameters);\n",__FUNCT__);
+        _printf_(true,"   usage: [Kff,Kfs] = %s(Kgg,nodesets);\n",__FUNCT__);
         _printf_(true,"\n");
 }

issm/trunk/src/mex/Reducematrixfromgtof/Reducematrixfromgtof.h ¶

@@ -21 +21 @@
 #define KGG (mxArray*)prhs[0]
 #define NODESETS (mxArray*)prhs[1]
-#define PARAMETERS (mxArray*)prhs[2]
 
 /* serial output macros: */
@@ -31 +30 @@
 #define NLHS  2
 #undef NRHS
-#define NRHS  3
+#define NRHS  2
 
 #endif  /* _REDUCEMATRIXFROMGTOF_H */