Changeset 7640 for issm/trunk/src/c/objects/Materials/Matpar.cpp
- Timestamp:
- 03/15/11 09:01:44 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk/src/c/objects/Materials/Matpar.cpp ¶
r5320 r7640 35 35 double matpar_thermal_exchange_velocity; 36 36 double matpar_g; 37 double matpar_gamma; 38 double matpar_kn; 37 39 38 40 matpar_g=iomodel->g; … … 46 48 matpar_mixed_layer_capacity=iomodel->mixed_layer_capacity; 47 49 matpar_thermal_exchange_velocity=iomodel->thermal_exchange_velocity; 50 matpar_gamma=iomodel->gamma; 51 matpar_kn=iomodel->kn; 48 52 49 53 this->mid=matpar_mid; … … 58 62 this->thermal_exchange_velocity=matpar_thermal_exchange_velocity; 59 63 this->g=matpar_g; 64 this->gamma=matpar_gamma; 65 this->kn=matpar_kn; 60 66 61 67 } … … 83 89 printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity); 84 90 printf(" g: %g\n",g); 91 printf(" gamma: %g\n",gamma); 92 printf(" kn: %g\n",kn); 85 93 return; 86 94 } … … 101 109 printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity); 102 110 printf(" g: %g\n",g); 111 printf(" gamma: %g\n",gamma); 112 printf(" kn: %g\n",kn); 103 113 return; 104 114 } … … 140 150 memcpy(marshalled_dataset,&thermal_exchange_velocity,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); 141 151 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); 142 154 143 155 *pmarshalled_dataset=marshalled_dataset; … … 159 171 sizeof(thermal_exchange_velocity)+ 160 172 sizeof(g)+ 173 sizeof(gamma)+ 174 sizeof(kn)+ 161 175 sizeof(int); //sizeof(int) for enum type 162 176 } … … 184 198 memcpy(&thermal_exchange_velocity,marshalled_dataset,sizeof(thermal_exchange_velocity));marshalled_dataset+=sizeof(thermal_exchange_velocity); 185 199 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); 186 202 187 203 /*return: */ … … 359 375 } 360 376 /*}}}1*/ 361 362 377 /*FUNCTION Matpar::GetGamma {{{1*/ 378 double Matpar::GetGamma(){ 379 return gamma; 380 } 381 /*}}}1*/ 382 /*FUNCTION Matpar::GetKn {{{1*/ 383 double Matpar::GetKn(){ 384 return kn; 385 } 386 /*}}}1*/
Note:
See TracChangeset
for help on using the changeset viewer.