Changeset 24556 for issm/trunk-jpl/src/c/classes/Inputs2/PentaInput2.cpp

Timestamp:

02/07/20 16:27:39 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: working on Josh's model

File:

• issm/trunk-jpl/src/c/classes/Inputs2/PentaInput2.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/Inputs2/PentaInput2.cpp

@@ -85 +85 @@
 /*}}}*/
 void PentaInput2::DeepEcho(void){/*{{{*/
-        _printf_("PentaInput2 Echo:\n");
-        _printf_("   interpolation:      "<<EnumToStringx(this->interpolation)<<"\n");
-        _printf_("   Size:               "<<M<<"x"<<N<<"\n");
-        _printf_("   isserved:           "<<(isserved?"true":"false") << "\n");
-        _printf_("   isserved_collapsed: "<<isserved_collapsed << "\n");
-        if(isserved){
-                _printf_("   current values:      ");
-                _printf_("[ ");
-                for(int i=0;i<6;i++) _printf_(" "<<this->element_values[i]);
-                _printf_("] ("<<EnumToStringx(this->interpolation)<<")\n");
-        }
-        printarray(this->values,this->M,this->N);
-        //_printf_(setw(15)<<"   PentaInput2 "<<setw(25)<<left<<EnumToStringx(this->enum_type)<<" "<<(value?"true":"false") << "\n");
-}
-/*}}}*/
-void PentaInput2::Echo(void){/*{{{*/
         _printf_("PentaInput2 Echo:\n");
         _printf_("   interpolation:      "<<EnumToStringx(this->interpolation)<<"\n");
@@ -123 +107 @@
 }
 /*}}}*/
+void PentaInput2::Echo(void){/*{{{*/
+        _printf_(setw(15)<<"   PentaInput "<<setw(25)<<left<<EnumToStringx(-1));
+        if(isserved){
+                if(isserved_collapsed){
+                        _printf_("[ ");
+                        for(int i=0;i<3;i++) _printf_(" "<<this->element_values[i]);
+                        _printf_("] ("<<EnumToStringx(this->interpolation)<<")\n");
+                }
+                else{
+                        _printf_("[ ");
+                        for(int i=0;i<PentaRef::NumberofNodes(this->interpolation);i++) _printf_(" "<<this->element_values[i]);
+                        _printf_("] ("<<EnumToStringx(this->interpolation)<<")\n");
+                }
+        }
+}
+/*}}}*/
 int  PentaInput2::Id(void){/*{{{*/
         return -1;