Changeset 21341 for issm/trunk/src/c/classes/Params/DoubleVecParam.cpp

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Params/DoubleVecParam.cpp (modified) (3 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr

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

@@ -39 +39 @@
 
 /*Object virtual functions definitions:*/
-void DoubleVecParam::Echo(void){/*{{{*/
+Param* DoubleVecParam::copy() {/*{{{*/
 
-        _printf_(setw(22)<<"   DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" size: "<<this->M<<"\n");
+        return new DoubleVecParam(this->enum_type,this->values,this->M);
 
 }
@@ -51 +51 @@
 }
 /*}}}*/
-int    DoubleVecParam::Id(void){ return -1; }/*{{{*/
-/*}}}*/
-int DoubleVecParam::ObjectEnum(void){/*{{{*/
+void DoubleVecParam::Echo(void){/*{{{*/
 
-        return DoubleVecParamEnum;
+        _printf_(setw(22)<<"   DoubleVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" size: "<<this->M<<"\n");
 
 }
 /*}}}*/
-Object* DoubleVecParam::copy() {/*{{{*/
-
-        return new DoubleVecParam(this->enum_type,this->values,this->M);
-
-}
+int    DoubleVecParam::Id(void){ return -1; }/*{{{*/
 /*}}}*/
 void DoubleVecParam::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
@@ -72 +66 @@
         MARSHALLING(M);
         MARSHALLING_DYNAMIC(values,IssmDouble,M);
+
+}
+/*}}}*/
+int DoubleVecParam::ObjectEnum(void){/*{{{*/
+
+        return DoubleVecParamEnum;
 
 }

@@ -5 +5 @@
 *.obj
 *.exe
-issm
-kriging
 appscan.*
 ouncemake*
@@ -19 +17 @@
 *.dirstamp
 .libs
+issm
+kriging
+issm_slr