Changeset 25836 for issm/trunk/src/c/classes/Elements/Seg.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/Elements/Seg.cpp (modified) (8 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/Elements/Seg.cpp

@@ -13 +13 @@
 #include <string.h>
 #include "../classes.h"
-#include "../Inputs2/SegInput2.h"
-#include "../Inputs2/TriaInput2.h"
+#include "../Inputs/SegInput.h"
+#include "../Inputs/TriaInput.h"
 #include "../../shared/shared.h"
 /*}}}*/
@@ -120 +120 @@
 }
 /*}}}*/
-void Seg::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
-
-        MARSHALLING_ENUM(SegEnum);
-        MARSHALLING(this->iscollapsed);
-        MARSHALLING(this->isonsurface);
-        MARSHALLING(this->isonbase);
-        MARSHALLING(this->collapsed_ids[0]);
-        MARSHALLING(this->collapsed_ids[1]);
+void Seg::Marshall(MarshallHandle* marshallhandle){ /*{{{*/
+
+        int object_enum = SegEnum;
+   marshallhandle->call(object_enum);
+
+        marshallhandle->call(this->iscollapsed);
+        marshallhandle->call(this->isonsurface);
+        marshallhandle->call(this->isonbase);
+        marshallhandle->call(this->collapsed_ids[0]);
+        marshallhandle->call(this->collapsed_ids[1]);
 
         /*Call parent classes: */
-        ElementHook::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
-        Element::MarshallElement(pmarshalled_data,pmarshalled_data_size,marshall_direction,this->numanalyses);
-        SegRef::Marshall(pmarshalled_data,pmarshalled_data_size,marshall_direction);
+        ElementHook::Marshall(marshallhandle);
+        Element::MarshallElement2(marshallhandle,this->numanalyses);
+        SegRef::Marshall(marshallhandle);
 
         vertices = (Vertex**)this->hvertices->deliverp();
@@ -186 +188 @@
         *pxyz_front=xyz_front;
 }/*}}}*/
-Input2*    Seg::GetInput2(int inputenum){/*{{{*/
+Input*    Seg::GetInput(int inputenum){/*{{{*/
 
         if(this->iscollapsed){
-                TriaInput2* input = this->inputs2->GetTriaInput(inputenum);
+                TriaInput* input = this->inputs->GetTriaInput(inputenum);
                 if(!input) return input;
 
@@ -221 +223 @@
         }
         else{
-                SegInput2* input = this->inputs2->GetSegInput(inputenum);
+                SegInput* input = this->inputs->GetSegInput(inputenum);
                 if(!input) return input;
 
@@ -252 +254 @@
         }
 }/*}}}*/
-Input2*    Seg::GetInput2(int inputenum,IssmDouble time){/*{{{*/
+Input*    Seg::GetInput(int inputenum,IssmDouble time){/*{{{*/
         _error_("not implemented yet");
 }/*}}}*/
@@ -264 +266 @@
 
         /*Recover parameters and values*/
-        Element::GetInputListOnVertices(&gl[0],MaskGroundediceLevelsetEnum);
+        Element::GetInputListOnVertices(&gl[0],MaskOceanLevelsetEnum);
 
         /*Be sure that values are not zero*/
@@ -301 +303 @@
 
 }/*}}}*/
-void       Seg::GetInputListOnVertices(IssmDouble* pvalue,Input2* input,IssmDouble default_value){/*{{{*/
+void       Seg::GetInputListOnVertices(IssmDouble* pvalue,Input* input,IssmDouble default_value){/*{{{*/
 
         /*Checks in debugging mode*/
@@ -319 +321 @@
 }
 /*}}}*/
-void       Seg::GetInputListOnNodes(IssmDouble* pvalue,Input2* input,IssmDouble default_value){/*{{{*/
+void       Seg::GetInputListOnNodes(IssmDouble* pvalue,Input* input,IssmDouble default_value){/*{{{*/
 
         /*Checks in debugging mode*/

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