Changeset 22758 for issm/trunk/src/c/classes/Params/IntVecParam.cpp

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Params/IntVecParam.cpp (modified) (1 diff)

issm/trunk/src/c

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod

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

@@ -58 +58 @@
 /*}}}*/
 void IntVecParam::DeepEcho(void){/*{{{*/
-
-        int i;
-
-        _printf_("IntVecParam:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   vector size: " << this->M << "\n");
-        for(i=0;i<this->M;i++){
-                _printf_(i << " " << this->values[i] << "\n");
-        }
+        _printf_(setw(22)<<"   IntVecParam "<<setw(35)<<left<<EnumToStringx(this->enum_type)<<" [");
+        for(int i=0;i<this->M;i++) _printf_(" "<<this->values[i]);
+        _printf_("]\n");
 }
 /*}}}*/
 void IntVecParam::Echo(void){/*{{{*/
 
-        _printf_("IntVecParam:\n");
-        _printf_("   enum: " << this->enum_type << " (" << EnumToStringx(this->enum_type) << ")\n");
-        _printf_("   vector size: " << this->M << "\n");
-
+        this->DeepEcho();
 }
 /*}}}*/

@@ -20 +20 @@
 kriging
 issm_slr
+issm_ocean
+lnb_param.mod
+lovenb_sub.mod
+model.mod
+util.mod