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

Timestamp:

04/27/10 08:27:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

now iomodel constructor also specifies the id

File:

• issm/trunk/src/c/objects/Matpar.cpp (modified) (4 diffs)

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

@@ -19 +19 @@
                 
 /*Object constructors and destructor*/
-/*FUNCTION Matpar::default constructor {{{1*/
+/*FUNCTION Matpar::Matpar() {{{1*/
 Matpar::Matpar(){
         return;
 }
 /*}}}1*/
-/*FUNCTION Matpar::constructorr {{{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){
 
@@ -31 +31 @@
 }
 /*}}}1*/
-/*FUNCTION Matpar::constructor  from iomodel{{{1*/
-Matpar::Matpar(IoModel* iomodel){
-
-        int       matpar_mid;
+/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/
+Matpar::Matpar(int matpar_mid, IoModel* iomodel){
+
         double  matpar_rho_ice;
         double  matpar_rho_water;
@@ -46 +45 @@
         double  matpar_g;
 
-        if (iomodel->analysis_type==DiagnosticAnalysisEnum && iomodel->sub_analysis_type==HutterAnalysisEnum){
-                if (strcmp(iomodel->meshtype,"2d")==0){
-                        matpar_mid=iomodel->numberofvertices+1; //put it at the end of the materials
-                }
-                else{ matpar_mid=iomodel->numberofvertices2d*(iomodel->numlayers-1)+1;}
-        }
-        else{
-                matpar_mid=iomodel->numberofelements+1; //put it at the end of the materials
-        }
         matpar_g=iomodel->g; 
         matpar_rho_ice=iomodel->rho_ice; 
@@ -88 +78 @@
 }
 /*}}}1*/
-/*FUNCTION Matpar::destructor{{{1*/
+/*FUNCTION Matpar::~Matpar() {{{1*/
 Matpar::~Matpar(){
         return;