Changeset 25836 for issm/trunk/src/c/classes/Numberedcostfunction.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

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

issm/trunk/src/c ¶

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

issm/trunk/src/c/classes/Numberedcostfunction.cpp ¶

@@ -86 +86 @@
 }
 /*}}}*/
-void Numberedcostfunction::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){/*{{{*/
+void Numberedcostfunction::Marshall(MarshallHandle* marshallhandle){/*{{{*/
         _error_("not implemented yet!"); 
 } 
@@ -134 +134 @@
                                  ThicknessAbsMisfitx(&value,femmodel-> elements,femmodel->nodes,femmodel-> vertices,femmodel-> loads,femmodel-> materials,femmodel-> parameters); 
                                  break;
+                         case ThicknessAbsGradientEnum:             
+                                 femmodel->ThicknessAbsGradientx(&value);
+                                 break;
                          case ThicknessAlongGradientEnum:         
                                  ThicknessAlongGradientx(&value,femmodel-> elements,femmodel->nodes,femmodel-> vertices,femmodel-> loads,femmodel-> materials,femmodel-> parameters); 
@@ -147 +150 @@
                                  break;
                          default:
-                                 _error_("not supported");
+                                 _error_(EnumToStringx(this->cost_functions_list[i])<<" not supported");
                  }
                  _printf0_("#"<<i+1<<": "<<value<<" ");

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post