Ignore:
Timestamp:
03/15/11 09:01:44 (14 years ago)
Author:
Eric.Larour
Message:

New hydrology solution, with new modules, new element routines, new data for materials, new model processing, and new solution configurations

File:
1 edited

Legend:

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

    r5320 r7640  
    3535        double  matpar_thermal_exchange_velocity;
    3636        double  matpar_g;
     37        double  matpar_gamma;
     38        double  matpar_kn;
    3739
    3840        matpar_g=iomodel->g;
     
    4648        matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity;
    4749        matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity;
     50        matpar_gamma=iomodel->gamma;
     51        matpar_kn=iomodel->kn;
    4852
    4953        this->mid=matpar_mid;
     
    5862        this->thermal_exchange_velocity=matpar_thermal_exchange_velocity;
    5963        this->g=matpar_g;
     64        this->gamma=matpar_gamma;
     65        this->kn=matpar_kn;
    6066
    6167}
     
    8389        printf("   thermal_exchange_velocity: %g\n",thermal_exchange_velocity);
    8490        printf("   g: %g\n",g);
     91        printf("   gamma: %g\n",gamma);
     92        printf("   kn: %g\n",kn);
    8593        return;
    8694}
     
    101109        printf("   thermal_exchange_velocity: %g\n",thermal_exchange_velocity);
    102110        printf("   g: %g\n",g);
     111        printf("   gamma: %g\n",gamma);
     112        printf("   kn: %g\n",kn);
    103113        return;
    104114}               
     
    140150        memcpy(marshalled_dataset,&thermal_exchange_velocity,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity);
    141151        memcpy(marshalled_dataset,&g,sizeof(g));marshalled_dataset+=sizeof(g);
     152        memcpy(marshalled_dataset,&gamma,sizeof(gamma));marshalled_dataset+=sizeof(gamma);
     153        memcpy(marshalled_dataset,&kn,sizeof(kn));marshalled_dataset+=sizeof(kn);
    142154
    143155        *pmarshalled_dataset=marshalled_dataset;
     
    159171                sizeof(thermal_exchange_velocity)+
    160172                sizeof(g)+
     173                sizeof(gamma)+
     174                sizeof(kn)+
    161175                sizeof(int); //sizeof(int) for enum type
    162176}
     
    184198        memcpy(&thermal_exchange_velocity,marshalled_dataset,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity);
    185199        memcpy(&g,marshalled_dataset,sizeof(g));marshalled_dataset+=sizeof(g);
     200        memcpy(&gamma,marshalled_dataset,sizeof(gamma));marshalled_dataset+=sizeof(gamma);
     201        memcpy(&kn,marshalled_dataset,sizeof(kn));marshalled_dataset+=sizeof(kn);
    186202
    187203        /*return: */
     
    359375}
    360376/*}}}1*/
    361 
    362 
     377/*FUNCTION Matpar::GetGamma {{{1*/
     378double Matpar::GetGamma(){
     379        return gamma;
     380}
     381/*}}}1*/
     382/*FUNCTION Matpar::GetKn {{{1*/
     383double Matpar::GetKn(){
     384        return kn;
     385}
     386/*}}}1*/
Note: See TracChangeset for help on using the changeset viewer.