Changeset 6163 for issm/trunk

Timestamp:

10/06/10 10:57:18 (15 years ago)

Author:

Mathieu Morlighem

Message:

Some cleaning in Params

Location:

issm/trunk/src/c/objects/Params

Files:

• BoolParam.h (modified) (2 diffs)
• DoubleMatArrayParam.h (modified) (2 diffs)
• DoubleMatParam.cpp (modified) (2 diffs)
• DoubleMatParam.h (modified) (2 diffs)
• DoubleParam.h (modified) (2 diffs)
• DoubleVecParam.cpp (modified) (1 diff)
• DoubleVecParam.h (modified) (2 diffs)
• FileParam.h (modified) (2 diffs)
• IntParam.h (modified) (2 diffs)
• PetscMatParam.h (modified) (2 diffs)
• PetscVecParam.h (modified) (2 diffs)
• StringArrayParam.h (modified) (2 diffs)
• StringParam.h (modified) (2 diffs)

issm/trunk/src/c/objects/Params/BoolParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/DoubleMatArrayParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/DoubleMatParam.cpp

@@ -155 +155 @@
 void  DoubleMatParam::GetParameterValue(double** pdoublearray,int* pM,int* pN){
         double* output=NULL;
-        int M,N;
-
-        M=this->M;
-        N=this->N;
+
         output=(double*)xmalloc((int)(M*N*sizeof(double)));
         memcpy(output,value,M*N*sizeof(double));
@@ -180 +177 @@
         mxArray* pfield2=NULL;
         double* doublemat=NULL;
-        int M,N;
         char* name=NULL;
         
         name=this->GetParameterName();
-        this->GetParameterValue(&doublemat,&M,&N);
+        this->GetParameterValue(&doublemat,NULL,NULL);
                                 
         pfield=mxCreateDoubleMatrix(0,0,mxREAL);

issm/trunk/src/c/objects/Params/DoubleMatParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/DoubleParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/DoubleVecParam.cpp

@@ -171 +171 @@
         char* name=NULL;
         double* doublevec=NULL;
-        int M;
         mxArray* pfield=NULL;
 
-        this->GetParameterValue(&doublevec,&M);
+        this->GetParameterValue(&doublevec,NULL);
         name=this->GetParameterName();
                                 

issm/trunk/src/c/objects/Params/DoubleVecParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/FileParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -23 +22 @@
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/IntParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -23 +22 @@
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/PetscMatParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/PetscVecParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/StringArrayParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/
 

issm/trunk/src/c/objects/Params/StringParam.h

@@ -9 +9 @@
 /*Headers:*/
 /*{{{1*/
-
 #ifdef HAVE_CONFIG_H
         #include "config.h"
@@ -20 +19 @@
 #endif
 
-
 #include "./Param.h"
 #include "../../include/include.h"
 #include "../../shared/shared.h"
-#include "../../include/include.h"
-#include "../../include/include.h"
 /*}}}*/