Changeset 19282

Timestamp:

04/09/15 17:09:13 (10 years ago)

Author:

schlegel

Message:

CHG: some marshalling cleanup of memory and warnings

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.h (modified) (2 diffs)
• classes/FemModel.cpp (modified) (1 diff)
• classes/Materials/Matice.cpp (modified) (1 diff)
• classes/Materials/Matpar.cpp (modified) (5 diffs)
• datastructures/DataSet.cpp (modified) (3 diffs)

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

@@ -122 +122 @@
                 void               LinearFloatingiceMeltingRate(); 
                 void               MigrateGroundingLine(IssmDouble* sheet_ungrounding);
-                void               Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses);
                 ElementMatrix*     NewElementMatrix(int approximation_enum=NoneApproximationEnum);
                 ElementMatrix*     NewElementMatrixCoupling(int number_nodes,int approximation_enum=NoneApproximationEnum);
@@ -228 +227 @@
                 virtual void       JacobianDeterminantSurface(IssmDouble* Jdet, IssmDouble* xyz_list,Gauss* gauss)=0;
                 virtual void       JacobianDeterminantTop(IssmDouble* Jdet,IssmDouble* xyz_list_base,Gauss* gauss)=0;
+                virtual void       Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction,int numanalyses);
                 virtual IssmDouble Masscon(IssmDouble* levelset)=0;
                 virtual IssmDouble MassFlux(IssmDouble* segment)=0;

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

@@ -764 +764 @@
                 }
 
-                /*Reset current configuration: */
+                //Reset current configuration:
                 analysis_type=this->analysis_type_list[analysis_counter];
                 SetCurrentConfiguration(analysis_type);

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -30 +30 @@
         this->helement=NULL;
         this->element=NULL;
+        this->isdamaged=false;
         return;
 }

issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp

@@ -18 +18 @@
 /*}}}*/
 Matpar::Matpar(int matpar_mid, IoModel* iomodel){/*{{{*/
+
+        rho_ice=0;
+        rho_water=0;
+        rho_freshwater=0;
+        mu_water=0;
+        heatcapacity=0;
+        thermalconductivity=0;
+        temperateiceconductivity=0;
+        latentheat=0;
+        beta=0;
+        meltingpoint=0;
+        referencetemperature=0;
+        mixed_layer_capacity=0;
+        thermal_exchange_velocity=0;
+        g=0;
+        omega=0;
+        desfac=0;
+        s0p=0;
+        s0t=0;
+        rlaps=0;
+        rlapslgm=0;
+        dpermil=0;
+
+        sediment_compressibility=0;
+        sediment_porosity=0;
+        sediment_thickness=0;
+        water_compressibility=0;
+
+        epl_compressibility=0;
+        epl_porosity=0;
+        epl_init_thickness=0;
+        epl_colapse_thickness=0;
+        epl_max_thickness=0;
+        epl_conductivity=0;
+
+        lithosphere_shear_modulus=0;
+        lithosphere_density=0;
+        mantle_shear_modulus=0;
+        mantle_density=0;
+
+        poisson=0;
+        young_modulus=0;
+        ridging_exponent=0;
+        cohesion=0;
+        internal_friction_coef=0;
+        compression_coef=0;
+        traction_coef=0;
+        time_relaxation_stress=0;
+        time_relaxation_damage=0;
 
         bool isefficientlayer;
@@ -151 +200 @@
 }               
 /*}}}*/
-int    Matpar::Id(void){ return mid; }/*{{{*/
-/*}}}*/
-int Matpar::ObjectEnum(void){/*{{{*/
+int  Matpar::Id(void){ return mid; }/*{{{*/
+/*}}}*/
+int  Matpar::ObjectEnum(void){/*{{{*/
 
         return MatparEnum;
@@ -237 +286 @@
         MARSHALLING(dpermil);
 
-        /*hydrology Dual Porous Continuum: */
+        //hydrology Dual Porous Continuum:
         MARSHALLING(sediment_compressibility);
         MARSHALLING(sediment_porosity);
@@ -250 +299 @@
         MARSHALLING(epl_conductivity);
 
-        /*gia: */
+        //gia:
         MARSHALLING(lithosphere_shear_modulus);
         MARSHALLING(lithosphere_density);
@@ -256 +305 @@
         MARSHALLING(mantle_density);
 
-        /*Sea ice*/
+        //Sea ice:
         MARSHALLING(poisson);
         MARSHALLING(young_modulus);

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

@@ -29 +29 @@
         sorted=0;
         numsorted=0;
+        presorted=0;
+        enum_type=-1;
         sorted_ids=NULL;
         id_offsets=NULL;
@@ -38 +40 @@
 
         sorted=0;
+        numsorted=0;
+        presorted=0;
         sorted_ids=NULL;
         id_offsets=NULL;
@@ -87 +91 @@
 
 /*Specific methods*/
-void DataSet::Marshall(char** pmarshalled_data, int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
+void  DataSet::Marshall(char** pmarshalled_data, int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
         
         vector<Object*>::iterator obj;