Changeset 12301
- Timestamp:
- 05/29/12 14:28:15 (13 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 2 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r12297 r12301 103 103 MaterialsRhoIceEnum, 104 104 MaterialsRhoWaterEnum, 105 MaterialsRhoFreshwaterEnum, 105 106 MaterialsMuWaterEnum, 106 107 MaterialsThermalExchangeVelocityEnum, … … 160 161 SurfaceforcingsMassBalanceEnum, 161 162 SurfaceforcingsIspddEnum, 162 SurfaceforcingsMonthlytemperatures ,163 SurfaceforcingsMonthlytemperaturesEnum, 163 164 ThermalMaxiterEnum, 164 165 ThermalPenaltyFactorEnum, -
issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp
r12297 r12301 107 107 case MaterialsRhoIceEnum : return "MaterialsRhoIce"; 108 108 case MaterialsRhoWaterEnum : return "MaterialsRhoWater"; 109 case MaterialsRhoFreshwaterEnum : return "MaterialsRhoFreshwater"; 109 110 case MaterialsMuWaterEnum : return "MaterialsMuWater"; 110 111 case MaterialsThermalExchangeVelocityEnum : return "MaterialsThermalExchangeVelocity"; … … 164 165 case SurfaceforcingsMassBalanceEnum : return "SurfaceforcingsMassBalance"; 165 166 case SurfaceforcingsIspddEnum : return "SurfaceforcingsIspdd"; 167 case SurfaceforcingsMonthlytemperaturesEnum : return "SurfaceforcingsMonthlytemperatures"; 166 168 case ThermalMaxiterEnum : return "ThermalMaxiter"; 167 169 case ThermalPenaltyFactorEnum : return "ThermalPenaltyFactor"; -
issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp
r12297 r12301 71 71 iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); 72 72 iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum); 73 iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperatures );73 iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum); 74 74 } 75 75 else{ -
issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp
r12297 r12301 108 108 else if (strcmp(name,"MaterialsRhoIce")==0) return MaterialsRhoIceEnum; 109 109 else if (strcmp(name,"MaterialsRhoWater")==0) return MaterialsRhoWaterEnum; 110 else if (strcmp(name,"MaterialsRhoFreshwater")==0) return MaterialsRhoFreshwaterEnum; 110 111 else if (strcmp(name,"MaterialsMuWater")==0) return MaterialsMuWaterEnum; 111 112 else if (strcmp(name,"MaterialsThermalExchangeVelocity")==0) return MaterialsThermalExchangeVelocityEnum; … … 136 137 else if (strcmp(name,"PrognosticMinThickness")==0) return PrognosticMinThicknessEnum; 137 138 else if (strcmp(name,"PrognosticPenaltyFactor")==0) return PrognosticPenaltyFactorEnum; 138 else if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum;139 139 else stage=2; 140 140 } 141 141 if(stage==2){ 142 if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; 142 if (strcmp(name,"PrognosticSpcthickness")==0) return PrognosticSpcthicknessEnum; 143 else if (strcmp(name,"PrognosticStabilization")==0) return PrognosticStabilizationEnum; 143 144 else if (strcmp(name,"PrognosticVertexPairing")==0) return PrognosticVertexPairingEnum; 144 145 else if (strcmp(name,"QmuIsdakota")==0) return QmuIsdakotaEnum; … … 168 169 else if (strcmp(name,"SurfaceforcingsMassBalance")==0) return SurfaceforcingsMassBalanceEnum; 169 170 else if (strcmp(name,"SurfaceforcingsIspdd")==0) return SurfaceforcingsIspddEnum; 171 else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; 170 172 else if (strcmp(name,"ThermalMaxiter")==0) return ThermalMaxiterEnum; 171 173 else if (strcmp(name,"ThermalPenaltyFactor")==0) return ThermalPenaltyFactorEnum; … … 258 260 else if (strcmp(name,"IntInput")==0) return IntInputEnum; 259 261 else if (strcmp(name,"IntParam")==0) return IntParamEnum; 260 else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum;261 else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum;262 262 else stage=3; 263 263 } 264 264 if(stage==3){ 265 if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; 265 if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; 266 else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; 267 else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; 266 268 else if (strcmp(name,"Matice")==0) return MaticeEnum; 267 269 else if (strcmp(name,"Matpar")==0) return MatparEnum; … … 381 383 else if (strcmp(name,"StressTensorzz")==0) return StressTensorzzEnum; 382 384 else if (strcmp(name,"IceVolume")==0) return IceVolumeEnum; 383 else if (strcmp(name,"P0")==0) return P0Enum;384 else if (strcmp(name,"P1")==0) return P1Enum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"P1DG")==0) return P1DGEnum; 388 if (strcmp(name,"P0")==0) return P0Enum; 389 else if (strcmp(name,"P1")==0) return P1Enum; 390 else if (strcmp(name,"P1DG")==0) return P1DGEnum; 389 391 else if (strcmp(name,"SaveResults")==0) return SaveResultsEnum; 390 392 else if (strcmp(name,"BoolElementResult")==0) return BoolElementResultEnum; -
issm/trunk/src/c/objects/Elements/Tria.cpp
r12300 r12301 2316 2316 /*Get material parameters :*/ 2317 2317 rho_ice=matpar->GetRhoIce(); 2318 //rho_freshwater=matpar->GetRhoWater();2318 rho_water=matpar->GetRhoFreshwater(); 2319 2319 2320 sconv=( 1000/rho_ice)/12.; //rhow_rain/rhoi / 12 months2320 sconv=(rho_water/rho_ice)/12.; //rhow_rain/rhoi / 12 months 2321 2321 2322 2322 /*PDD constant*/ -
issm/trunk/src/c/objects/Materials/Matpar.cpp
r11527 r12301 25 25 Matpar::Matpar(int matpar_mid, IoModel* iomodel){ 26 26 27 this->mid 27 this->mid = matpar_mid; 28 28 iomodel->Constant(&this->rho_ice,MaterialsRhoIceEnum); 29 29 iomodel->Constant(&this->rho_water,MaterialsRhoWaterEnum); 30 iomodel->Constant(&this->rho_freshwater,MaterialsRhoFreshwaterEnum); 30 31 iomodel->Constant(&this->mu_water,MaterialsMuWaterEnum); 31 32 iomodel->Constant(&this->heatcapacity,MaterialsHeatcapacityEnum); … … 60 61 printf(" rho_ice: %g\n",rho_ice); 61 62 printf(" rho_water: %g\n",rho_water); 63 printf(" rho_freshwater: %g\n",rho_freshwater); 62 64 printf(" mu_water: %g\n",mu_water); 63 65 printf(" heatcapacity: %g\n",heatcapacity); … … 76 78 void Matpar::DeepEcho(void){ 77 79 78 printf("Matpar:\n"); 79 printf(" mid: %i\n",mid); 80 printf(" rho_ice: %g\n",rho_ice); 81 printf(" rho_water: %g\n",rho_water); 82 printf(" mu_water: %g\n",mu_water); 83 printf(" heatcapacity: %g\n",heatcapacity); 84 printf(" thermalconductivity: %g\n",thermalconductivity); 85 printf(" latentheat: %g\n",latentheat); 86 printf(" beta: %g\n",beta); 87 printf(" meltingpoint: %g\n",meltingpoint); 88 printf(" referencetemperature: %g\n",referencetemperature); 89 printf(" mixed_layer_capacity: %g\n",mixed_layer_capacity); 90 printf(" thermal_exchange_velocity: %g\n",thermal_exchange_velocity); 91 printf(" g: %g\n",g); 92 return; 80 this->Echo(); 93 81 } 94 82 /*}}}1*/ … … 122 110 memcpy(marshalled_dataset,&rho_ice,sizeof(rho_ice));marshalled_dataset+=sizeof(rho_ice); 123 111 memcpy(marshalled_dataset,&rho_water,sizeof(rho_water));marshalled_dataset+=sizeof(rho_water); 112 memcpy(marshalled_dataset,&rho_freshwater,sizeof(rho_freshwater));marshalled_dataset+=sizeof(rho_freshwater); 124 113 memcpy(marshalled_dataset,&mu_water,sizeof(mu_water));marshalled_dataset+=sizeof(mu_water); 125 114 memcpy(marshalled_dataset,&heatcapacity,sizeof(heatcapacity));marshalled_dataset+=sizeof(heatcapacity); … … 143 132 sizeof(rho_ice)+ 144 133 sizeof(rho_water)+ 134 sizeof(rho_freshwater)+ 145 135 sizeof(mu_water)+ 146 136 sizeof(heatcapacity)+ … … 170 160 memcpy(&rho_ice,marshalled_dataset,sizeof(rho_ice));marshalled_dataset+=sizeof(rho_ice); 171 161 memcpy(&rho_water,marshalled_dataset,sizeof(rho_water));marshalled_dataset+=sizeof(rho_water); 162 memcpy(&rho_freshwater,marshalled_dataset,sizeof(rho_freshwater));marshalled_dataset+=sizeof(rho_freshwater); 172 163 memcpy(&mu_water,marshalled_dataset,sizeof(mu_water));marshalled_dataset+=sizeof(mu_water); 173 164 memcpy(&heatcapacity,marshalled_dataset,sizeof(heatcapacity));marshalled_dataset+=sizeof(heatcapacity); … … 243 234 this->rho_ice=constant; 244 235 break; 245 246 236 case MaterialsRhoWaterEnum: 247 237 this->rho_water=constant; 248 238 break; 249 239 case MaterialsRhoFreshwaterEnum: 240 this->rho_freshwater=constant; 241 break; 250 242 case MaterialsMuWaterEnum: 251 243 this->mu_water=constant; 252 244 break; 253 254 245 case MaterialsHeatcapacityEnum: 255 246 this->heatcapacity=constant; 256 247 break; 257 258 248 case MaterialsThermalconductivityEnum: 259 249 this->thermalconductivity=constant; 260 250 break; 261 262 251 case MaterialsLatentheatEnum: 263 252 this->latentheat=constant; 264 253 break; 265 266 254 case MaterialsBetaEnum: 267 255 this->beta=constant; 268 256 break; 269 270 257 case MaterialsMeltingpointEnum: 271 258 this->meltingpoint=constant; 272 259 break; 273 274 260 case ConstantsReferencetemperatureEnum: 275 261 this->referencetemperature=constant; 276 262 break; 277 278 263 case MaterialsMixedLayerCapacityEnum: 279 264 this->mixed_layer_capacity=constant; 280 265 break; 281 282 266 case MaterialsThermalExchangeVelocityEnum: 283 267 this->thermalconductivity=constant; 284 268 break; 285 286 269 case ConstantsGEnum: 287 270 this->g=constant; 288 271 break; 289 290 272 default: 291 273 break; … … 362 344 double Matpar::GetRhoWater(){ 363 345 return rho_water; 346 } 347 /*}}}1*/ 348 /*FUNCTION Matpar::GetRhoFreshwater {{{1*/ 349 double Matpar::GetRhoFreshwater(){ 350 return rho_freshwater; 364 351 } 365 352 /*}}}1*/ -
issm/trunk/src/c/objects/Materials/Matpar.h
r11995 r12301 15 15 16 16 private: 17 int mid; 18 double rho_ice; 19 double rho_water; 17 int mid; 18 double rho_ice; 19 double rho_water; 20 double rho_freshwater; 20 21 double mu_water; 21 22 double heatcapacity; … … 77 78 double GetRhoIce(); 78 79 double GetRhoWater(); 80 double GetRhoFreshwater(); 79 81 double GetMuWater(); 80 82 double GetMixedLayerCapacity(); -
issm/trunk/src/m/classes/materials.m
r11995 r12301 8 8 rho_ice = 0; 9 9 rho_water = 0; 10 rho_freshwater = 0; 10 11 mu_water = 0; 11 12 heatcapacity = 0; … … 34 35 obj.rho_ice=917; 35 36 36 % water density (kg/m^3)37 %ocean water density (kg/m^3) 37 38 obj.rho_water=1023; 39 40 %fresh water density (kg/m^3) 41 obj.rho_freshwater=1000; 38 42 39 43 %water viscosity (N.s/m^2) … … 68 72 checkfield(md,'materials.rho_ice','>',0); 69 73 checkfield(md,'materials.rho_water','>',0); 74 checkfield(md,'materials.rho_freshwater','>',0); 70 75 checkfield(md,'materials.mu_water','>',0); 71 76 checkfield(md,'materials.rheology_B','>',0,'size',[md.mesh.numberofvertices 1]); … … 77 82 78 83 fielddisplay(obj,'rho_ice','ice density [kg/m^3]'); 79 fielddisplay(obj,'rho_water','water density [kg/m^3]'); 84 fielddisplay(obj,'rho_water','ocean water density [kg/m^3]'); 85 fielddisplay(obj,'freshrho_water','fresh water density [kg/m^3]'); 80 86 fielddisplay(obj,'mu_water','water viscosity [N s/m^2]'); 81 87 fielddisplay(obj,'heatcapacity','heat capacity [J/kg/K]'); … … 93 99 WriteData(fid,'object',obj,'fieldname','rho_ice','format','Double'); 94 100 WriteData(fid,'object',obj,'fieldname','rho_water','format','Double'); 101 WriteData(fid,'object',obj,'fieldname','rho_freshwater','format','Double'); 95 102 WriteData(fid,'object',obj,'fieldname','mu_water','format','Double'); 96 103 WriteData(fid,'object',obj,'fieldname','heatcapacity','format','Double');
Note:
See TracChangeset
for help on using the changeset viewer.