Changeset 8581

Timestamp:

06/09/11 07:47:06 (14 years ago)

Author:

Mathieu Morlighem

Message:

cleaner Matpar

File:

• issm/trunk/src/c/objects/Materials/Matpar.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Materials/Matpar.cpp

@@ -25 +25 @@
 Matpar::Matpar(int matpar_mid, IoModel* iomodel){
 
-        double  matpar_rho_ice;
-        double  matpar_rho_water;
-        double  matpar_heatcapacity;
-        double  matpar_thermalconductivity;
-        double  matpar_latentheat;
-        double  matpar_beta;
-        double  matpar_meltingpoint;
-        double  matpar_referencetemperature;
-        double  matpar_mixed_layer_capacity;
-        double  matpar_thermal_exchange_velocity;
-        double  matpar_g;
-        double  matpar_kn;
-
-        matpar_g=iomodel->g; 
-        matpar_rho_ice=iomodel->rho_ice; 
-        matpar_rho_water=iomodel->rho_water; 
-        matpar_thermalconductivity=iomodel->thermalconductivity; 
-        matpar_heatcapacity=iomodel->heatcapacity; 
-        matpar_latentheat=iomodel->latentheat; 
-        matpar_beta=iomodel->beta; 
-        matpar_meltingpoint=iomodel->meltingpoint; 
-        matpar_referencetemperature=iomodel->referencetemperature; 
-        matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity; 
-        matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity; 
-        matpar_kn=iomodel->hydro_kn; 
-
-        this->mid=matpar_mid; 
-        this->rho_ice=matpar_rho_ice; 
-        this->rho_water=matpar_rho_water; 
-        this->heatcapacity=matpar_heatcapacity; 
-        this->thermalconductivity=matpar_thermalconductivity; 
-        this->latentheat=matpar_latentheat; 
-        this->beta=matpar_beta; 
-        this->meltingpoint=matpar_meltingpoint; 
-        this->referencetemperature=matpar_referencetemperature; 
-        this->mixed_layer_capacity=matpar_mixed_layer_capacity; 
-        this->thermal_exchange_velocity=matpar_thermal_exchange_velocity; 
-        this->g=matpar_g; 
-        this->kn=matpar_kn; 
-        this->hydro_p=iomodel->hydro_p; 
-        this->hydro_q=iomodel->hydro_q; 
-   this->hydro_CR=iomodel->hydro_CR; 
-   this->hydro_n=iomodel->hydro_n; 
+        this->mid                       = matpar_mid;
+        this->rho_ice                   = iomodel->rho_ice;
+        this->rho_water                 = iomodel->rho_water;
+        this->heatcapacity              = iomodel->heatcapacity;
+        this->thermalconductivity       = iomodel->thermalconductivity;
+        this->latentheat                = iomodel->latentheat;
+        this->beta                      = iomodel->beta;
+        this->meltingpoint              = iomodel->meltingpoint;
+        this->referencetemperature      = iomodel->referencetemperature;
+        this->mixed_layer_capacity      = iomodel->mixed_layer_capacity;
+        this->thermal_exchange_velocity = iomodel->thermal_exchange_velocity;
+        this->g                         = iomodel->g;
+        this->kn                        = iomodel->hydro_kn;
+        this->hydro_p                   = iomodel->hydro_p;
+        this->hydro_q                   = iomodel->hydro_q;
+        this->hydro_CR                  = iomodel->hydro_CR;
+        this->hydro_n                   = iomodel->hydro_n;
 }
 /*}}}1*/