Changeset 4569
- Timestamp:
- 07/13/10 17:54:27 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp
r4491 r4569 83 83 84 84 #ifdef _ISSM_DEBUG_ 85 PetscSynchronizedPrintf(MPI_COMM_WORLD,"Parameter ve tor:");85 PetscSynchronizedPrintf(MPI_COMM_WORLD,"Parameter vector:"); 86 86 PetscSynchronizedFlush(MPI_COMM_WORLD); 87 87 for(k=0;k<numberofvertices;k++){ … … 89 89 PetscSynchronizedFlush(MPI_COMM_WORLD); 90 90 } 91 PetscSynchronizedPrintf(MPI_COMM_WORLD," enum: %i\n",StringAsEnum(root)); 92 PetscSynchronizedFlush(MPI_COMM_WORLD); 91 93 #endif 92 94 -
issm/trunk/src/c/objects/Elements/Penta.cpp
r4562 r4569 2782 2782 name==RheologyBEnum || 2783 2783 name==RheologyNEnum || 2784 name==FitEnum || 2785 name==DragCoefficientEnum || 2784 2786 name==GradientEnum || 2785 name==OldGradientEnum || 2786 name==FitEnum 2787 name==OldGradientEnum 2787 2788 ) { 2788 2789 return true; -
issm/trunk/src/c/objects/Elements/Tria.cpp
r4567 r4569 410 410 case VertexEnum: 411 411 412 /*New PentaVertexInpu*/412 /*New TriaVertexInput*/ 413 413 double values[3]; 414 414 … … 5924 5924 name==RheologyBEnum || 5925 5925 name==RheologyNEnum || 5926 name==FitEnum || 5927 name==DragCoefficientEnum || 5926 5928 name==GradientEnum || 5927 5929 name==OldGradientEnum || 5928 name==FitEnum5929 5930 ){ 5930 5931 return true; -
issm/trunk/src/c/objects/Materials/Matpar.cpp
r4546 r4569 240 240 case RhoIceEnum: 241 241 this->rho_ice=constant; 242 break; 242 243 243 244 case RhoWaterEnum: 244 245 this->rho_water=constant; 246 break; 245 247 246 248 case HeatCapacityEnum: 247 249 this->heatcapacity=constant; 250 break; 248 251 249 252 case ThermalConductivityEnum: 250 253 this->thermalconductivity=constant; 254 break; 251 255 252 256 case LatentHeatEnum: 253 257 this->latentheat=constant; 258 break; 254 259 255 260 case BetaEnum: 256 261 this->beta=constant; 262 break; 257 263 258 264 case MeltingPointEnum: 259 265 this->meltingpoint=constant; 266 break; 260 267 261 268 case MixedLayerCapacityEnum: 262 269 this->mixed_layer_capacity=constant; 270 break; 263 271 264 272 case ThermalExchangeVelocityEnum: 265 273 this->thermalconductivity=constant; 274 break; 266 275 267 276 case GravityEnum: 268 277 this->g=constant; 278 break; 269 279 270 280 default: -
issm/trunk/src/m/classes/public/postsolveparallel.m
r2617 r4569 26 26 27 27 %reread onto md.errlog 28 md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n')); 28 try, 29 md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n','bufsize',1000000)); 30 catch me, 31 disp('postsolveparallel: captured textread error, errlog is too large to read!'); 32 md.errlog=''; %too big to read 33 end 29 34 md.memoryleaks=memoryleaks; 30 35 -
issm/trunk/src/m/solutions/SpawnCore.m
r4548 r4569 23 23 %now process the results to get response function values 24 24 responses=DakotaResponses(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,responsedescriptors); 25 26 format long27 responses -
issm/trunk/src/m/utils/Nightly/testsgetfields.m
r4552 r4569 37 37 field_values={vel,j,parameter}; 38 38 elseif qmu, 39 fields={'dakota.importancefactors'}; 39 field_names={'dakota.importancefactors'}; 40 field_values={md.results.dakota.importancefactors}; 40 41 else 41 42 if md.dim==3
Note:
See TracChangeset
for help on using the changeset viewer.