Changeset 13117
- Timestamp:
- 08/21/12 16:23:21 (13 years ago)
- Location:
- issm/branches/trunk-jpl-damage/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/branches/trunk-jpl-damage/src/c/classes/objects/Elements/Penta.cpp
r13104 r13117 1964 1964 1965 1965 /*update input*/ 1966 this->inputs->AddInput(new PentaP1Input(name,values)); 1966 if (name==MaterialsRheologyZEnum || name==MaterialsRheologyZbarEnum){ 1967 matice->inputs->AddInput(new PentaP1Input(name,values)); 1968 } 1969 else{ 1970 this->inputs->AddInput(new PentaP1Input(name,values)); 1971 } 1967 1972 return; 1968 1973 break; … … 4352 4357 for(i=0;i<numdof;i++) B[i]=B_average; 4353 4358 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); 4354 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyZEnum,B));4355 4359 break; 4356 4360 case ArrheniusEnum: … … 4361 4365 for(i=0;i<numdof;i++) B[i]=B_average; 4362 4366 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); 4363 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyZEnum,B));4364 4367 break; 4365 4368 default: … … 4432 4435 for(i=0;i<numdof;i++) B[i]=B_average; 4433 4436 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); 4434 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyZEnum,B));4435 4437 break; 4436 4438 case ArrheniusEnum: … … 4441 4443 for(i=0;i<numdof;i++) B[i]=B_average; 4442 4444 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyBEnum,B)); 4443 this->matice->inputs->AddInput(new PentaP1Input(MaterialsRheologyZEnum,B));4444 4445 break; 4445 4446 default: … … 4469 4470 input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); 4470 4471 } 4472 else if(enum_type==MaterialsRheologyZbarEnum){ 4473 if(!IsOnBed()) return; 4474 input=(Input*)matice->inputs->GetInput(MaterialsRheologyZEnum); 4475 } 4476 4471 4477 else{ 4472 4478 input=inputs->GetInput(enum_type); … … 4486 4492 if(enum_type==MaterialsRheologyBbarEnum){ 4487 4493 input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); 4494 } 4495 else if(enum_type==MaterialsRheologyZbarEnum){ 4496 input=(Input*)matice->inputs->GetInput(MaterialsRheologyZEnum); 4488 4497 } 4489 4498 else{ … … 4505 4514 if(enum_type==MaterialsRheologyBbarEnum){ 4506 4515 input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); 4516 } 4517 else if(enum_type==MaterialsRheologyZbarEnum){ 4518 input=(Input*)matice->inputs->GetInput(MaterialsRheologyZEnum); 4507 4519 } 4508 4520 else{ … … 5126 5138 input=(Input*)matice->inputs->GetInput(MaterialsRheologyBEnum); _assert_(input); 5127 5139 } 5140 else if(control_type[i]==MaterialsRheologyZbarEnum){ 5141 if (!IsOnBed()) goto cleanup_and_return; 5142 input=(Input*)matice->inputs->GetInput(MaterialsRheologyZEnum); _assert_(input); 5143 } 5128 5144 else{ 5129 5145 input=(Input*)this->inputs->GetInput(control_type[i]); _assert_(input); … … 5138 5154 if(control_type[i]==MaterialsRheologyBbarEnum){ 5139 5155 this->InputExtrude(MaterialsRheologyBEnum,MaterialsEnum); 5156 } 5157 else if(control_type[i]==MaterialsRheologyZbarEnum){ 5158 this->InputExtrude(MaterialsRheologyZEnum,MaterialsEnum); 5140 5159 } 5141 5160 } -
issm/branches/trunk-jpl-damage/src/c/classes/objects/Materials/Matice.cpp
r13101 r13117 314 314 /*Intermediaries: */ 315 315 IssmDouble A,e; 316 IssmDouble B,n; 317 318 /*Get B and n*/ 319 B=GetB(); 316 IssmDouble B,n,Z; 317 318 /*Get B, Z and n*/ 320 319 n=GetN(); 320 Z=GetZ(); 321 B=Z*GetB(); 321 322 322 323 if (n==1){ … … 384 385 /*Intermediaries: */ 385 386 IssmDouble A,e; 386 IssmDouble B,n ;387 IssmDouble B,n,Z; 387 388 IssmDouble eps0; 388 389 389 390 /*Get B and n*/ 390 391 eps0=pow((IssmDouble)10,(IssmDouble)-27); 391 B=GetB();392 392 n=GetN(); 393 Z=GetZ(); 394 B=Z*GetB(); 393 395 394 396 if (n==1){ -
issm/branches/trunk-jpl-damage/src/m/contrib/hack/tres.m
r13021 r13117 105 105 case MaterialsRheologyBEnum(), string='rheology_B'; return 106 106 case MaterialsRheologyBbarEnum(), string='rheology_B'; return 107 case MaterialsRheologyZEnum(), string='rheology_Z'; return 108 case MaterialsRheologyZbarEnum(), string='rheology_Z'; return 107 109 case BalancethicknessThickeningRateEnum(), string='dhdt'; return 108 110 case VxEnum(), string='vx'; return
Note:
See TracChangeset
for help on using the changeset viewer.