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

Timestamp:

06/28/16 15:51:32 (9 years ago)

Author:

agscott1

Message:

CHG: Alphabetized all function names under classes

File:

• issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (modified) (4 diffs)

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

@@ -179 +179 @@
 
 /*Object virtual functions definitions:*/
+Object* Matpar::copy() {/*{{{*/
+
+        /*Output*/
+        Matpar* matpar;
+
+        /*Initialize output*/
+        matpar=new Matpar(*this);
+
+        /*copy fields: */
+        matpar->mid=this->mid;
+        matpar->rho_ice=this->rho_ice;
+        matpar->rho_water=this->rho_water;
+        matpar->rho_freshwater=this->rho_freshwater;
+        matpar->mu_water=this->mu_water;
+        matpar->heatcapacity=this->heatcapacity;
+        matpar->thermalconductivity=this->thermalconductivity;
+        matpar->temperateiceconductivity=this->temperateiceconductivity;
+        matpar->latentheat=this->latentheat;
+        matpar->beta=this->beta;
+        matpar->meltingpoint=this->meltingpoint;
+        matpar->referencetemperature=this->referencetemperature;
+        matpar->mixed_layer_capacity=this->mixed_layer_capacity;
+        matpar->thermal_exchange_velocity=this->thermal_exchange_velocity;
+        matpar->g=this->g;
+        matpar->desfac=this->desfac;
+        matpar->rlaps=this->rlaps;
+        matpar->rlapslgm=this->rlapslgm;
+        matpar->dpermil=this->dpermil;
+
+        matpar->sediment_compressibility=this->sediment_compressibility;
+        matpar->sediment_porosity=this->sediment_porosity;
+        matpar->sediment_thickness=this->sediment_thickness;
+        matpar->water_compressibility=this->water_compressibility;
+
+        matpar->epl_compressibility=this->epl_compressibility;
+        matpar->epl_porosity=this->epl_porosity;
+        matpar->epl_init_thickness=this->epl_init_thickness;
+        matpar->epl_colapse_thickness=this->epl_colapse_thickness;
+        matpar->epl_max_thickness=this->epl_max_thickness;
+        matpar->epl_conductivity=this->epl_conductivity;
+
+        matpar->lithosphere_shear_modulus=this->lithosphere_shear_modulus;
+        matpar->lithosphere_density=this->lithosphere_density;
+        matpar->mantle_shear_modulus=this->mantle_shear_modulus;
+        matpar->mantle_density=this->mantle_density;
+        
+        matpar->earth_density=this->earth_density;
+
+        return matpar;
+}
+/*}}}*/
+void Matpar::DeepEcho(void){/*{{{*/
+
+        this->Echo();
+}               
+/*}}}*/
 void Matpar::Echo(void){/*{{{*/
 
@@ -204 +260 @@
 }
 /*}}}*/
-void Matpar::DeepEcho(void){/*{{{*/
-
-        this->Echo();
-}               
-/*}}}*/
 int  Matpar::Id(void){ return mid; }/*{{{*/
-/*}}}*/
-int  Matpar::ObjectEnum(void){/*{{{*/
-
-        return MatparEnum;
-
-}
-/*}}}*/
-Object* Matpar::copy() {/*{{{*/
-
-        /*Output*/
-        Matpar* matpar;
-
-        /*Initialize output*/
-        matpar=new Matpar(*this);
-
-        /*copy fields: */
-        matpar->mid=this->mid;
-        matpar->rho_ice=this->rho_ice;
-        matpar->rho_water=this->rho_water;
-        matpar->rho_freshwater=this->rho_freshwater;
-        matpar->mu_water=this->mu_water;
-        matpar->heatcapacity=this->heatcapacity;
-        matpar->thermalconductivity=this->thermalconductivity;
-        matpar->temperateiceconductivity=this->temperateiceconductivity;
-        matpar->latentheat=this->latentheat;
-        matpar->beta=this->beta;
-        matpar->meltingpoint=this->meltingpoint;
-        matpar->referencetemperature=this->referencetemperature;
-        matpar->mixed_layer_capacity=this->mixed_layer_capacity;
-        matpar->thermal_exchange_velocity=this->thermal_exchange_velocity;
-        matpar->g=this->g;
-        matpar->desfac=this->desfac;
-        matpar->rlaps=this->rlaps;
-        matpar->rlapslgm=this->rlapslgm;
-        matpar->dpermil=this->dpermil;
-
-        matpar->sediment_compressibility=this->sediment_compressibility;
-        matpar->sediment_porosity=this->sediment_porosity;
-        matpar->sediment_thickness=this->sediment_thickness;
-        matpar->water_compressibility=this->water_compressibility;
-
-        matpar->epl_compressibility=this->epl_compressibility;
-        matpar->epl_porosity=this->epl_porosity;
-        matpar->epl_init_thickness=this->epl_init_thickness;
-        matpar->epl_colapse_thickness=this->epl_colapse_thickness;
-        matpar->epl_max_thickness=this->epl_max_thickness;
-        matpar->epl_conductivity=this->epl_conductivity;
-
-        matpar->lithosphere_shear_modulus=this->lithosphere_shear_modulus;
-        matpar->lithosphere_density=this->lithosphere_density;
-        matpar->mantle_shear_modulus=this->mantle_shear_modulus;
-        matpar->mantle_density=this->mantle_density;
-        
-        matpar->earth_density=this->earth_density;
-
-        return matpar;
-}
 /*}}}*/
 void Matpar::Marshall(char** pmarshalled_data,int* pmarshalled_data_size, int marshall_direction){ /*{{{*/
@@ -328 +322 @@
 }
 /*}}}*/
+int  Matpar::ObjectEnum(void){/*{{{*/
+
+        return MatparEnum;
+
+}
+/*}}}*/
 
 /*Update virtual functions definitions:*/
-void   Matpar::InputUpdateFromVector(IssmDouble* vector, int name, int type){/*{{{*/
-        /*Nothing updated yet*/
-}
-/*}}}*/
-void   Matpar::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*{{{*/
-        /*Nothing updated yet*/
-}
-/*}}}*/
-void  Matpar::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols,int name, int type){/*{{{*/
-        /*Nothing updated yet*/
-}
-/*}}}*/
 void   Matpar::InputUpdateFromConstant(IssmDouble constant, int name){/*{{{*/
 
@@ -410 +398 @@
 /*}}}*/
 void   Matpar::InputUpdateFromConstant(bool constant, int name){/*{{{*/
+        /*Nothing updated yet*/
+}
+/*}}}*/
+void  Matpar::InputUpdateFromMatrixDakota(IssmDouble* matrix, int nrows, int ncols,int name, int type){/*{{{*/
+        /*Nothing updated yet*/
+}
+/*}}}*/
+void   Matpar::InputUpdateFromVector(IssmDouble* vector, int name, int type){/*{{{*/
+        /*Nothing updated yet*/
+}
+/*}}}*/
+void   Matpar::InputUpdateFromVectorDakota(IssmDouble* vector, int name, int type){/*{{{*/
         /*Nothing updated yet*/
 }