Changeset 26525

Timestamp:

11/02/21 05:33:26 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added Marshall to Cfsurfacesquare

Location:

issm/trunk-jpl/src/c

Files:

• classes/Cfsurfacesquare.cpp (modified) (1 diff)
• classes/Cfsurfacesquare.h (modified) (1 diff)
• datastructures/DataSet.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Cfsurfacesquare.cpp

@@ -83 +83 @@
 /*}}}*/
 void Cfsurfacesquare::Marshall(MarshallHandle* marshallhandle){/*{{{*/
-        _error_("not implemented yet!"); 
+
+        int object_enum=CfsurfacesquareEnum;
+        marshallhandle->call(object_enum);
+
+        marshallhandle->call(this->definitionenum);
+        marshallhandle->call(this->local);
+        marshallhandle->call(this->model_enum);
+        marshallhandle->call(this->name);
+        marshallhandle->call(this->observation_enum);
+        marshallhandle->call(this->weights_enum);
+        marshallhandle->call(this->datatime);
+        marshallhandle->call(this->timepassedflag);
+        marshallhandle->call(this->misfit);
 } 
 /*}}}*/

issm/trunk-jpl/src/c/classes/Cfsurfacesquare.h

@@ -22 +22 @@
                 char*       name;
                 int         observation_enum;
-                char*       timeinterpolation;
                 int         weights_enum;
                 IssmDouble      datatime;

issm/trunk-jpl/src/c/datastructures/DataSet.cpp

@@ -256 +256 @@
                                 this->AddObject(Cflevelset);
                         }
+                        else if(obj_enum==CfsurfacesquareEnum){
+                                Cfsurfacesquare* cfsurf=new Cfsurfacesquare();
+                                cfsurf->Marshall(marshallhandle);
+                                this->AddObject(cfsurf);
+                        }
                         else if(obj_enum==MassfluxatgateEnum){
                                 Massfluxatgate<IssmDouble>* massfluxgate=new Massfluxatgate<IssmDouble>();