Ignore:
Timestamp:
04/27/10 08:27:06 (15 years ago)
Author:
Mathieu Morlighem
Message:

now iomodel constructor also specifies the id

File:
1 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk/src/c/objects/Matpar.cpp

    r3567 r3622  
    1919               
    2020/*Object constructors and destructor*/
    21 /*FUNCTION Matpar::default constructor {{{1*/
     21/*FUNCTION Matpar::Matpar() {{{1*/
    2222Matpar::Matpar(){
    2323        return;
    2424}
    2525/*}}}1*/
    26 /*FUNCTION Matpar::constructorr {{{1*/
     26/*FUNCTION Matpar::Matpar(int matpar_mid, double matpar_rho_ice, double matpar_rho_water, double matpar_heatcapacity, ...){{{1*/
    2727Matpar::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){
    2828
     
    3131}
    3232/*}}}1*/
    33 /*FUNCTION Matpar::constructor  from iomodel{{{1*/
    34 Matpar::Matpar(IoModel* iomodel){
    35 
    36         int       matpar_mid;
     33/*FUNCTION Matpar::Matpar(int matpar_mid,IoModel* iomodel){{{1*/
     34Matpar::Matpar(int matpar_mid, IoModel* iomodel){
     35
    3736        double  matpar_rho_ice;
    3837        double  matpar_rho_water;
     
    4645        double  matpar_g;
    4746
    48         if (iomodel->analysis_type==DiagnosticAnalysisEnum && iomodel->sub_analysis_type==HutterAnalysisEnum){
    49                 if (strcmp(iomodel->meshtype,"2d")==0){
    50                         matpar_mid=iomodel->numberofvertices+1; //put it at the end of the materials
    51                 }
    52                 else{ matpar_mid=iomodel->numberofvertices2d*(iomodel->numlayers-1)+1;}
    53         }
    54         else{
    55                 matpar_mid=iomodel->numberofelements+1; //put it at the end of the materials
    56         }
    5747        matpar_g=iomodel->g;
    5848        matpar_rho_ice=iomodel->rho_ice;
     
    8878}
    8979/*}}}1*/
    90 /*FUNCTION Matpar::destructor{{{1*/
     80/*FUNCTION Matpar::~Matpar() {{{1*/
    9181Matpar::~Matpar(){
    9282        return;
Note: See TracChangeset for help on using the changeset viewer.