Changeset 12044

Timestamp:

04/18/12 07:58:50 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed Fetch and Write for Bamg objects

Location:

issm/trunk-jpl/src/modules

Files:

• BamgConvertMesh/BamgConvertMesh.cpp (modified) (1 diff)
• BamgMesher/BamgMesher.cpp (modified) (2 diffs)

issm/trunk-jpl/src/modules/BamgConvertMesh/BamgConvertMesh.cpp

@@ -64 +64 @@
 
         /*Generate output Matlab Structures*/
-        bamggeom->SetStructureFields((void*)BAMGGEOMOUT);
-        bamgmesh->SetStructureFields((void*)BAMGMESHOUT);
+        WriteData(BAMGGEOMOUT,bamggeom);
+        WriteData(BAMGMESHOUT,bamgmesh);
 
         /*Clean up*/

issm/trunk-jpl/src/modules/BamgMesher/BamgMesher.cpp

@@ -23 +23 @@
         CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&BamgMesherUsage);
 
-        /*Initialize variables*/
-        bamgopts   = new BamgOpts(BAMGOPTIONS);
-        bamggeom_in= new BamgGeom(BAMGGEOMIN);
-        bamgmesh_in= new BamgMesh(BAMGMESHIN);
-
         /*Initialize outputs*/
         bamggeom_out=new BamgGeom();
         bamgmesh_out=new BamgMesh();
+
+        /*Fetch inputs: */
+        FetchData(&bamgopts,BAMGOPTIONS);
+        FetchData(&bamggeom_in,BAMGMESHIN);
+        FetchData(&bamgmesh_in,BAMGGEOMIN);
 
         /*!Generate internal degree of freedom numbers: */
@@ -36 +36 @@
 
         /*Generate output Matlab Structures*/
-        bamggeom_out->SetStructureFields((void*)BAMGGEOMOUT);
-        bamgmesh_out->SetStructureFields((void*)BAMGMESHOUT);
+        WriteData(BAMGGEOMOUT,bamggeom);
+        WriteData(BAMGMESHOUT,bamgmesh);
 
         /*Free ressources: */