Changeset 24387

Timestamp:

11/22/19 08:22:53 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: disconnecting bamg from dataset to speed up compilation

Location:

issm/trunk-jpl/src/c

Files:

• bamg/BamgQuadtree.cpp (modified) (5 diffs)
• bamg/BamgQuadtree.h (modified) (2 diffs)
• classes/Elements/Element.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/bamg/BamgQuadtree.cpp

@@ -2 +2 @@
 #include <string.h>
 #include <stdlib.h>
-
 #include "./bamgobjects.h"
-#include "../datastructures/datastructures.h"
 
 namespace bamg {
@@ -68 +66 @@
                 this->NbVertices    = 0;
 
-                /*Create container*/
-                this->boxcontainer=new DataSet();
-
                 /*Create Root, pointer toward the main box*/
                 this->root=NewBamgQuadtreeBox();
@@ -80 +75 @@
                 this->NbQuadtreeBox = 0;
                 this->NbVertices    = 0;
-
-                /*Create container*/
-                this->boxcontainer=new DataSet();
 
                 /*Create Root, pointer toward the main box*/
@@ -99 +91 @@
         /*}}}*/
         BamgQuadtree::~BamgQuadtree() {/*{{{*/
-                delete boxcontainer;
+
+                vector<BamgQuadtreeBox*>::reverse_iterator object;
+                for(object=boxcontainer.rbegin() ; object <boxcontainer.rend(); object++ ){
+                        delete (*object);
+                }
+                boxcontainer.clear();
                 root=NULL;
         }
@@ -514 +511 @@
 
                 /*Add root to the container*/
-                boxcontainer->AddObject(newbox);
+                boxcontainer.push_back(newbox);
                 this->NbQuadtreeBox++;
 

issm/trunk-jpl/src/c/bamg/BamgQuadtree.h

@@ -3 +3 @@
 #define _BAMGQUADTREE_H
 
+#include <vector>
 #include "./include.h"
-#include "../datastructures/datastructures.h"
 class BamgVertex;
 
@@ -17 +17 @@
                          * - up to 4 vertices
                          * - 4 "sub" quadtree boxes*/
-                        class BamgQuadtreeBox: public Object{ 
+                        class BamgQuadtreeBox{ 
                                 public:
                                         int              nbitems;
                                         BamgQuadtreeBox *box[4];
                                         BamgVertex      *v[4];
-                                        /*Object functions*/
-                                        void    Echo()       {_error_("not implemented yet"); };
-                                        void    DeepEcho()   {_error_("not implemented yet"); };
-                                        int     Id()         {_error_("not implemented yet"); };
-                                        int     ObjectEnum() {_error_("not implemented yet"); };
-                                        Object *copy()       {_error_("not implemented yet"); };
-                                        void Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ _error_("not implemented yet!"); };
                         };
 
                         /*BamgQuadtree private Fields*/
-                        DataSet* boxcontainer;
+                        std::vector<BamgQuadtreeBox*> boxcontainer;
 
                 public:

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -2962 +2962 @@
 
         /*Update inputs*/
-        // TransientInput* NewTemperatureInput = new TransientInput(SmbMonthlytemperaturesEnum);
-        // TransientInput* NewPrecipitationInput = new TransientInput(SmbPrecipitationEnum);
-        // for (int imonth=0;imonth<12;imonth++) {
-        //   for(i=0;i<NUM_VERTICES;i++) tmp[i]=monthlytemperatures[i*12+imonth];
-        //   TriaInput* newmonthinput1 = new TriaInput(SmbMonthlytemperaturesEnum,&tmp[0],P1Enum);
-        //   NewTemperatureInput->AddTimeInput(newmonthinput1,time+imonth/12.*yts);
-        //
-        //   for(i=0;i<NUM_VERTICES;i++) tmp[i]=monthlyprec[i*12+imonth]/yts;
-        //   TriaInput* newmonthinput2 = new TriaInput(SmbPrecipitationEnum,&tmp[0],P1Enum);
-        //   NewPrecipitationInput->AddTimeInput(newmonthinput2,time+imonth/12.*yts);
-        // }
-        // NewTemperatureInput->Configure(this->parameters);
-        // NewPrecipitationInput->Configure(this->parameters);
-
         switch(this->ObjectEnum()){
                 case TriaEnum:
@@ -3027 +3013 @@
         xDelete<IssmDouble>(s0p);
         xDelete<IssmDouble>(tmp);
-
 }
 /*}}}*/