Changeset 4966

Timestamp:

08/04/10 10:49:50 (15 years ago)

Author:

seroussi

Message:

removed constructor from Matpar

Location:

issm/trunk/src/c/objects/Materials

Files:

• Matpar.cpp (modified) (3 diffs)
• Matpar.h (modified) (1 diff)

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

@@ -22 +22 @@
 }
 /*}}}1*/
-/*FUNCTION Matpar::Matpar(int matpar_mid, double matpar_rho_ice, double matpar_rho_water, double matpar_heatcapacity, ...){{{1*/
-Matpar::Matpar(int      matpar_mid, 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_mixed_layer_capacity, double  matpar_thermal_exchange_velocity, double  matpar_g){
-
-        this->Init(matpar_mid, matpar_rho_ice, matpar_rho_water, matpar_heatcapacity, matpar_thermalconductivity, matpar_latentheat, matpar_beta, matpar_meltingpoint, matpar_mixed_layer_capacity, matpar_thermal_exchange_velocity, matpar_g);
-
-}
-/*}}}1*/
 /*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/
 Matpar::Matpar(int matpar_mid, IoModel* iomodel){
@@ -53 +46 @@
         matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity; 
         matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity; 
-
-        this->Init(matpar_mid, matpar_rho_ice, matpar_rho_water, matpar_heatcapacity, matpar_thermalconductivity, matpar_latentheat, matpar_beta, matpar_meltingpoint, matpar_mixed_layer_capacity, matpar_thermal_exchange_velocity, matpar_g);
-
-}
-/*}}}1*/
-/*FUNCTION Matpar::Init {{{1*/
-void Matpar::Init(int   matpar_mid, 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_mixed_layer_capacity, double  matpar_thermal_exchange_velocity, double  matpar_g){
 
         this->mid=matpar_mid; 
@@ -73 +59 @@
         this->g=matpar_g; 
 
-        return;
 }
 /*}}}1*/

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

@@ -31 +31 @@
                 Matpar();
         
-                Matpar(int      mid, double     rho_ice, double rho_water, double  heatcapacity, double  thermalconductivity, double  latentheat, double  beta, double  meltingpoint, double  mixed_layer_capacity, double  thermal_exchange_velocity, double  g);
-                void Init(int   mid, double     rho_ice, double rho_water, double  heatcapacity, double  thermalconductivity, double  latentheat, double  beta, double  meltingpoint, double  mixed_layer_capacity, double  thermal_exchange_velocity, double  g);
                 Matpar(int matpar_id, IoModel* iomodel);
                 ~Matpar();