Changeset 3417 for issm/trunk/src/c/objects/Matpar.cpp

Timestamp:

04/07/10 12:23:51 (15 years ago)

Author:

Eric.Larour

Message:

Massive temporary commit: redesign to include vertices (for galerkin discontinous), to simplify ModelProcessor.

File:

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

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

@@ -18 +18 @@
                 
 /*Object constructors and destructor*/
-/*FUNCTION Matpar::constructor {{{1*/
+/*FUNCTION Matpar::default constructor {{{1*/
 Matpar::Matpar(){
         return;
 }
 /*}}}1*/
-/*FUNCTION Matpar::creation {{{1*/
+/*FUNCTION Matpar::constructorr {{{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){
 
-
-        mid=matpar_mid; 
-        rho_ice=matpar_rho_ice; 
-        rho_water=matpar_rho_water; 
-        heatcapacity=matpar_heatcapacity; 
-        thermalconductivity=matpar_thermalconductivity; 
-        latentheat=matpar_latentheat; 
-        beta=matpar_beta; 
-        meltingpoint=matpar_meltingpoint; 
-        mixed_layer_capacity=matpar_mixed_layer_capacity; 
-        thermal_exchange_velocity=matpar_thermal_exchange_velocity; 
-        g=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::constructor  from iomodel{{{1*/
+Matpar::Matpar(IoModel* iomodel){
+
+        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;
+
+        matpar_mid=iomodel->numberofelements+1; //put it at the end of the materials
+        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_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*/
+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; 
+        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->mixed_layer_capacity=matpar_mixed_layer_capacity; 
+        this->thermal_exchange_velocity=matpar_thermal_exchange_velocity; 
+        this->g=matpar_g; 
 
         return;