Changeset 6130
- Timestamp:
- 10/04/10 00:01:17 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 10 added
- 210 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r6099 r6130 179 179 DragTypeEnum, 180 180 DtEnum, 181 TimeAdaptEnum, 182 CflCoefficientEnum, 181 183 ElementOnBedEnum, 182 184 ElementOnIceShelfEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r6099 r6130 153 153 case DragTypeEnum : return "DragType"; 154 154 case DtEnum : return "Dt"; 155 case TimeAdaptEnum : return "TimeAdapt"; 156 case CflCoefficientEnum : return "CflCoefficient"; 155 157 case ElementOnBedEnum : return "ElementOnBed"; 156 158 case ElementOnIceShelfEnum : return "ElementOnIceShelf"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r6099 r6130 151 151 else if (strcmp(name,"DragType")==0) return DragTypeEnum; 152 152 else if (strcmp(name,"Dt")==0) return DtEnum; 153 else if (strcmp(name,"TimeAdapt")==0) return TimeAdaptEnum; 154 else if (strcmp(name,"CflCoefficient")==0) return CflCoefficientEnum; 153 155 else if (strcmp(name,"ElementOnBed")==0) return ElementOnBedEnum; 154 156 else if (strcmp(name,"ElementOnIceShelf")==0) return ElementOnIceShelfEnum; -
issm/trunk/src/c/Makefile.am
r6024 r6130 480 480 ./modules/UpdateGeometryx/UpdateGeometryx.h\ 481 481 ./modules/UpdateGeometryx/UpdateGeometryx.cpp\ 482 ./modules/TimeAdaptx/TimeAdaptx.h\ 483 ./modules/TimeAdaptx/TimeAdaptx.cpp\ 482 484 ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\ 483 485 ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\ … … 1039 1041 ./modules/UpdateGeometryx/UpdateGeometryx.h\ 1040 1042 ./modules/UpdateGeometryx/UpdateGeometryx.cpp\ 1043 ./modules/TimeAdaptx/TimeAdaptx.h\ 1044 ./modules/TimeAdaptx/TimeAdaptx.cpp\ 1041 1045 ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\ 1042 1046 ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\ -
issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp
r6014 r6130 54 54 parameters->AddObject(new DoubleParam(DtEnum,iomodel->dt*iomodel->yts)); //Dt is in years in iomodel 55 55 parameters->AddObject(new DoubleParam(NdtEnum,iomodel->ndt*iomodel->yts)); //Ndt is in yeats in iomodel 56 parameters->AddObject(new BoolParam(TimeAdaptEnum,iomodel->time_adapt)); 57 parameters->AddObject(new DoubleParam(CflCoefficientEnum,iomodel->cfl_coefficient)); 56 58 parameters->AddObject(new DoubleParam(PenaltyOffsetEnum,iomodel->penalty_offset)); 57 59 parameters->AddObject(new DoubleParam(SparsityEnum,iomodel->sparsity)); -
issm/trunk/src/c/modules/modules.h
r5772 r6130 83 83 #include "./SurfaceAreax/SurfaceAreax.h" 84 84 #include "./SystemMatricesx/SystemMatricesx.h" 85 #include "./TimeAdaptx/TimeAdaptx.h" 85 86 #include "./TriaSearchx/TriaSearchx.h" 86 87 #include "./ThicknessAbsMisfitx/ThicknessAbsMisfitx.h" -
issm/trunk/src/c/objects/Elements/Element.h
r5772 r6130 77 77 virtual bool InputConvergence(double* eps, int* enums,int num_enums,int* criterionenums,double* criterionvalues,int num_criterionenums)=0; 78 78 virtual void AverageOntoPartition(Vec partition_contributions,Vec partition_areas,double* vertex_response,double* qmu_part)=0; 79 virtual double TimeAdapt()=0; 79 80 80 81 /*Implementation: */ -
issm/trunk/src/c/objects/Elements/Penta.cpp
r6077 r6130 1288 1288 } 1289 1289 /*}}}*/ 1290 /*FUNCTION Penta::TimeAdapt{{{1*/ 1291 double Penta::TimeAdapt(void){ 1292 1293 /*intermediary: */ 1294 double C; 1295 double maxabsvx; 1296 double maxabsvy; 1297 double maxabsvz; 1298 double maxx,minx; 1299 double maxy,miny; 1300 double maxz,minz; 1301 double dx,dy,dz; 1302 double xyz_list[NUMVERTICES][3]; 1303 int i; 1304 1305 /*output: */ 1306 double dt; 1307 1308 /*get CFL coefficient:*/ 1309 this->parameters->FindParam(&C,CflCoefficientEnum); 1310 1311 /*Get for Vx and Vy, the max of abs value: */ 1312 this->MaxAbsVx(&maxabsvx,false); 1313 this->MaxAbsVy(&maxabsvy,false); 1314 this->MaxAbsVz(&maxabsvz,false); 1315 1316 /* Get node coordinates and dof list: */ 1317 GetVerticesCoordinates(&xyz_list[0][0], this->nodes, NUMVERTICES); 1318 1319 minx=xyz_list[0][0]; 1320 maxx=xyz_list[0][0]; 1321 miny=xyz_list[0][1]; 1322 maxy=xyz_list[0][1]; 1323 minz=xyz_list[0][2]; 1324 maxz=xyz_list[0][2]; 1325 1326 for(i=1;i<NUMVERTICES;i++){ 1327 if (xyz_list[i][0]<minx)minx=xyz_list[i][0]; 1328 if (xyz_list[i][0]>maxx)maxx=xyz_list[i][0]; 1329 if (xyz_list[i][1]<miny)miny=xyz_list[i][1]; 1330 if (xyz_list[i][1]>maxy)maxy=xyz_list[i][1]; 1331 if (xyz_list[i][2]<minz)minz=xyz_list[i][2]; 1332 if (xyz_list[i][2]>maxz)maxz=xyz_list[i][2]; 1333 } 1334 dx=maxx-minx; 1335 dy=maxy-miny; 1336 dz=maxz-minz; 1337 1338 /*CFL criterion: */ 1339 dt=C/(maxabsvy/dx+maxabsvy/dy+maxabsvz/dz); 1340 1341 return dt; 1342 1343 } 1290 1344 /*FUNCTION Penta::ThicknessAbsMisfit {{{1*/ 1291 1345 double Penta::ThicknessAbsMisfit(bool process_units){ -
issm/trunk/src/c/objects/Elements/Penta.h
r5933 r6130 118 118 void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type); 119 119 void UpdateGeometry(void); 120 double TimeAdapt(); 120 121 /*}}}*/ 121 122 /*Penta specific routines:{{{1*/ -
issm/trunk/src/c/objects/Elements/Tria.cpp
r6029 r6130 1509 1509 } 1510 1510 /*}}}*/ 1511 /*FUNCTION Tria::TimeAdapt{{{1*/ 1512 double Tria::TimeAdapt(void){ 1513 1514 /*intermediary: */ 1515 double C; 1516 double maxabsvx; 1517 double maxabsvy; 1518 double maxx,minx; 1519 double maxy,miny; 1520 double xyz_list[NUMVERTICES][3]; 1521 double dx,dy; 1522 int i; 1523 1524 /*output: */ 1525 double dt; 1526 1527 /*get CFL coefficient:*/ 1528 this->parameters->FindParam(&C,CflCoefficientEnum); 1529 1530 /*Get for Vx and Vy, the max of abs value: */ 1531 this->MaxAbsVx(&maxabsvx,false); 1532 this->MaxAbsVy(&maxabsvy,false); 1533 1534 /* Get node coordinates and dof list: */ 1535 GetVerticesCoordinates(&xyz_list[0][0], this->nodes, NUMVERTICES); 1536 1537 minx=xyz_list[0][0]; 1538 maxx=xyz_list[0][0]; 1539 miny=xyz_list[0][1]; 1540 maxy=xyz_list[0][1]; 1541 1542 for(i=1;i<NUMVERTICES;i++){ 1543 if (xyz_list[i][0]<minx)minx=xyz_list[i][0]; 1544 if (xyz_list[i][0]>maxx)maxx=xyz_list[i][0]; 1545 if (xyz_list[i][1]<miny)miny=xyz_list[i][1]; 1546 if (xyz_list[i][1]>maxy)maxy=xyz_list[i][1]; 1547 } 1548 dx=maxx-minx; 1549 dy=maxy-miny; 1550 1551 /*CFL criterion: */ 1552 dt=C/(maxabsvy/dx+maxabsvy/dy); 1553 1554 return dt; 1555 1556 } 1557 /*}}}*/ 1511 1558 /*FUNCTION Tria::ThicknessAbsMisfit {{{1*/ 1512 1559 double Tria::ThicknessAbsMisfit(bool process_units){ -
issm/trunk/src/c/objects/Elements/Tria.h
r6029 r6130 119 119 void Update(int index, IoModel* iomodel,int analysis_counter,int analysis_type); 120 120 void UpdateGeometry(void); 121 double TimeAdapt(); 121 122 /*}}}*/ 122 123 /*Tria specific routines:{{{1*/ -
issm/trunk/src/c/objects/IoModel.cpp
r6014 r6130 175 175 IoModelFetchData(&this->dt,iomodel_handle,"dt"); 176 176 IoModelFetchData(&this->ndt,iomodel_handle,"ndt"); 177 IoModelFetchData(&this->time_adapt,iomodel_handle,"time_adapt"); 178 IoModelFetchData(&this->cfl_coefficient,iomodel_handle,"cfl_coefficient"); 177 179 IoModelFetchData(&this->penalty_offset,iomodel_handle,"penalty_offset"); 178 180 IoModelFetchData(&this->penalty_melting,iomodel_handle,"penalty_melting"); … … 316 318 this->dt=0; 317 319 this->ndt=0; 320 this->time_adapt=0; 321 this->cfl_coefficient=0; 318 322 this->penalty_offset=0; 319 323 this->penalty_melting=0; -
issm/trunk/src/c/objects/IoModel.h
r6014 r6130 140 140 double max_nonlinear_iterations; 141 141 double dt,ndt; 142 int time_adapt; 143 double cfl_coefficient; 142 144 double penalty_offset; 143 145 double penalty_melting; -
issm/trunk/src/c/solutions/transient2d_core.cpp
r5318 r6130 21 21 int solution_type; 22 22 bool control_analysis; 23 bool time_adapt=false; 23 24 int output_frequency; 24 25 … … 35 36 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); 36 37 femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum); 38 femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum); 37 39 38 40 /*initialize: */ … … 43 45 44 46 /*Increment*/ 47 if(time_adapt) TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 45 48 time+=dt; 46 49 step+=1; 47 50 48 _printf_("%s%g%s%i%s%g \n","time [yr]: ",time," iteration number: ",step,"/",floor(finaltime/dt));51 _printf_("%s%g%s%i%s%g%s%g\n","time [yr]: ",time/yts," iteration number: ",step,"/",floor(finaltime/dt)," dt [yr]: ",dt/yts); 49 52 50 53 if(verbose)_printf_("%s\n","computing new velocity"); -
issm/trunk/src/c/solutions/transient3d_core.cpp
r5318 r6130 20 20 double dt,yts; 21 21 bool control_analysis; 22 bool time_adapt=false; 22 23 int solution_type; 23 24 int output_frequency; … … 35 36 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); 36 37 femmodel->parameters->FindParam(&output_frequency,OutputFrequencyEnum); 38 femmodel->parameters->FindParam(&time_adapt,TimeAdaptEnum); 37 39 38 40 /*initialize: */ … … 43 45 44 46 /*Increment*/ 47 if(time_adapt) TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 45 48 step+=1; 46 49 time+=dt; 47 50 48 if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time," iteration number: ",step,"/",floor(finaltime/dt));51 _printf_("%s%g%s%i%s%g%s%g\n","time [yr]: ",time/yts," iteration number: ",step,"/",floor(finaltime/dt)," dt [yr]: ",dt/yts); 49 52 50 53 if(verbose)_printf_("computing temperatures:\n"); -
issm/trunk/src/m/classes/@model/model.m
r6014 r6130 183 183 md.dt=0; 184 184 md.ndt=0; 185 md.time_adapt=0; 186 md.cfl_coefficient=1/2; 187 md.adaptative_cfl=0; 185 188 md.artificial_diffusivity=0; 186 189 md.prognostic_DG=0; -
issm/trunk/src/m/classes/@model/setdefaultparameters.m
r6038 r6130 127 127 md.ndt=10*md.dt; 128 128 129 %time adaptation? 130 md.time_adapt=0; 131 md.cfl_coefficient=1/2; 132 129 133 %the artificial diffusivity is used in prognostic to avoid 130 134 %numerical wiggles of the solution. -
issm/trunk/src/m/classes/clusters/pfe.m
r6107 r6130 187 187 if ~cluster.interactive, 188 188 packages={[md.name '.outlog'],[md.name '.errlog']}; 189 else 190 packages={}; 189 191 end 190 192 if md.qmu_analysis, -
issm/trunk/src/m/enum/AbsoluteEnum.m
r6100 r6130 9 9 % macro=AbsoluteEnum() 10 10 11 macro=24 3;11 macro=245; -
issm/trunk/src/m/enum/AdjointEnum.m
r6100 r6130 9 9 % macro=AdjointEnum() 10 10 11 macro=2 58;11 macro=260; -
issm/trunk/src/m/enum/BetaEnum.m
r6100 r6130 9 9 % macro=BetaEnum() 10 10 11 macro=25 3;11 macro=255; -
issm/trunk/src/m/enum/BoolExternalResultEnum.m
r6100 r6130 9 9 % macro=BoolExternalResultEnum() 10 10 11 macro=21 7;11 macro=219; -
issm/trunk/src/m/enum/CmGradientEnum.m
r6100 r6130 9 9 % macro=CmGradientEnum() 10 10 11 macro=25 4;11 macro=256; -
issm/trunk/src/m/enum/CmJumpEnum.m
r6100 r6130 9 9 % macro=CmJumpEnum() 10 10 11 macro=25 5;11 macro=257; -
issm/trunk/src/m/enum/CmMaxEnum.m
r6100 r6130 9 9 % macro=CmMaxEnum() 10 10 11 macro=25 6;11 macro=258; -
issm/trunk/src/m/enum/CmMinEnum.m
r6100 r6130 9 9 % macro=CmMinEnum() 10 10 11 macro=25 7;11 macro=259; -
issm/trunk/src/m/enum/ColinearEnum.m
r6100 r6130 9 9 % macro=ColinearEnum() 10 10 11 macro=25 1;11 macro=253; -
issm/trunk/src/m/enum/ConnectivityEnum.m
r6100 r6130 9 9 % macro=ConnectivityEnum() 10 10 11 macro=26 1;11 macro=263; -
issm/trunk/src/m/enum/ControlParameterEnum.m
r6100 r6130 9 9 % macro=ControlParameterEnum() 10 10 11 macro=26 2;11 macro=264; -
issm/trunk/src/m/enum/ControlSteadyEnum.m
r6100 r6130 9 9 % macro=ControlSteadyEnum() 10 10 11 macro=26 3;11 macro=265; -
issm/trunk/src/m/enum/DakotaParameterEnum.m
r6100 r6130 9 9 % macro=DakotaParameterEnum() 10 10 11 macro=26 4;11 macro=266; -
issm/trunk/src/m/enum/DimEnum.m
r6100 r6130 9 9 % macro=DimEnum() 10 10 11 macro=26 5;11 macro=267; -
issm/trunk/src/m/enum/DoubleElementResultEnum.m
r6100 r6130 9 9 % macro=DoubleElementResultEnum() 10 10 11 macro=21 4;11 macro=216; -
issm/trunk/src/m/enum/DoubleExternalResultEnum.m
r6100 r6130 9 9 % macro=DoubleExternalResultEnum() 10 10 11 macro=2 18;11 macro=220; -
issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m
r6100 r6130 9 9 % macro=DoubleMatExternalResultEnum() 10 10 11 macro=22 0;11 macro=222; -
issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m
r6100 r6130 9 9 % macro=DoubleVecExternalResultEnum() 10 10 11 macro=2 19;11 macro=221; -
issm/trunk/src/m/enum/ElementOnBedEnum.m
r6100 r6130 9 9 % macro=ElementOnBedEnum() 10 10 11 macro=13 7;11 macro=139; -
issm/trunk/src/m/enum/ElementOnIceShelfEnum.m
r6100 r6130 9 9 % macro=ElementOnIceShelfEnum() 10 10 11 macro=1 38;11 macro=140; -
issm/trunk/src/m/enum/ElementOnSurfaceEnum.m
r6100 r6130 9 9 % macro=ElementOnSurfaceEnum() 10 10 11 macro=1 39;11 macro=141; -
issm/trunk/src/m/enum/ElementOnWaterEnum.m
r6100 r6130 9 9 % macro=ElementOnWaterEnum() 10 10 11 macro=14 0;11 macro=142; -
issm/trunk/src/m/enum/EnumToString.m
r6100 r6130 148 148 case DragTypeEnum(), string='DragType'; return 149 149 case DtEnum(), string='Dt'; return 150 case TimeAdaptEnum(), string='TimeAdapt'; return 151 case CflCoefficientEnum(), string='CflCoefficient'; return 150 152 case ElementOnBedEnum(), string='ElementOnBed'; return 151 153 case ElementOnIceShelfEnum(), string='ElementOnIceShelf'; return -
issm/trunk/src/m/enum/EpsAbsEnum.m
r6100 r6130 9 9 % macro=EpsAbsEnum() 10 10 11 macro=26 6;11 macro=268; -
issm/trunk/src/m/enum/EpsCmEnum.m
r6100 r6130 9 9 % macro=EpsCmEnum() 10 10 11 macro=26 7;11 macro=269; -
issm/trunk/src/m/enum/EpsRelEnum.m
r6100 r6130 9 9 % macro=EpsRelEnum() 10 10 11 macro=2 68;11 macro=270; -
issm/trunk/src/m/enum/EpsResEnum.m
r6100 r6130 9 9 % macro=EpsResEnum() 10 10 11 macro=2 69;11 macro=271; -
issm/trunk/src/m/enum/EpsVelEnum.m
r6100 r6130 9 9 % macro=EpsVelEnum() 10 10 11 macro=14 1;11 macro=143; -
issm/trunk/src/m/enum/ExtToIuEnum.m
r6100 r6130 9 9 % macro=ExtToIuEnum() 10 10 11 macro=1 49;11 macro=151; -
issm/trunk/src/m/enum/FillEnum.m
r6100 r6130 9 9 % macro=FillEnum() 10 10 11 macro=14 2;11 macro=144; -
issm/trunk/src/m/enum/FractionIncrementEnum.m
r6100 r6130 9 9 % macro=FractionIncrementEnum() 10 10 11 macro=14 3;11 macro=145; -
issm/trunk/src/m/enum/FrictionEnum.m
r6100 r6130 9 9 % macro=FrictionEnum() 10 10 11 macro=14 4;11 macro=146; -
issm/trunk/src/m/enum/FsetEnum.m
r6100 r6130 9 9 % macro=FsetEnum() 10 10 11 macro=31 6;11 macro=318; -
issm/trunk/src/m/enum/GeothermalFluxEnum.m
r6100 r6130 9 9 % macro=GeothermalFluxEnum() 10 10 11 macro=14 5;11 macro=147; -
issm/trunk/src/m/enum/GradientEnum.m
r6100 r6130 9 9 % macro=GradientEnum() 10 10 11 macro=2 59;11 macro=261; -
issm/trunk/src/m/enum/GravityEnum.m
r6100 r6130 9 9 % macro=GravityEnum() 10 10 11 macro=24 6;11 macro=248; -
issm/trunk/src/m/enum/GsetEnum.m
r6100 r6130 9 9 % macro=GsetEnum() 10 10 11 macro=31 5;11 macro=317; -
issm/trunk/src/m/enum/HeatCapacityEnum.m
r6100 r6130 9 9 % macro=HeatCapacityEnum() 10 10 11 macro=27 0;11 macro=272; -
issm/trunk/src/m/enum/IndexEnum.m
r6100 r6130 9 9 % macro=IndexEnum() 10 10 11 macro=30 3;11 macro=305; -
issm/trunk/src/m/enum/IndexedEnum.m
r6100 r6130 9 9 % macro=IndexedEnum() 10 10 11 macro=30 1;11 macro=303; -
issm/trunk/src/m/enum/IntExternalResultEnum.m
r6100 r6130 9 9 % macro=IntExternalResultEnum() 10 10 11 macro=22 1;11 macro=223; -
issm/trunk/src/m/enum/InternalEnum.m
r6100 r6130 9 9 % macro=InternalEnum() 10 10 11 macro=14 6;11 macro=148; -
issm/trunk/src/m/enum/IntersectEnum.m
r6100 r6130 9 9 % macro=IntersectEnum() 10 10 11 macro=25 0;11 macro=252; -
issm/trunk/src/m/enum/IsHutterEnum.m
r6100 r6130 9 9 % macro=IsHutterEnum() 10 10 11 macro=27 1;11 macro=273; -
issm/trunk/src/m/enum/IsMacAyealPattynEnum.m
r6100 r6130 9 9 % macro=IsMacAyealPattynEnum() 10 10 11 macro=27 2;11 macro=274; -
issm/trunk/src/m/enum/IsStokesEnum.m
r6100 r6130 9 9 % macro=IsStokesEnum() 10 10 11 macro=27 3;11 macro=275; -
issm/trunk/src/m/enum/IuToExtEnum.m
r6100 r6130 9 9 % macro=IuToExtEnum() 10 10 11 macro=1 48;11 macro=150; -
issm/trunk/src/m/enum/JEnum.m
r6100 r6130 9 9 % macro=JEnum() 10 10 11 macro=22 4;11 macro=226; -
issm/trunk/src/m/enum/KffEnum.m
r6100 r6130 9 9 % macro=KffEnum() 10 10 11 macro=27 4;11 macro=276; -
issm/trunk/src/m/enum/KflagEnum.m
r6100 r6130 9 9 % macro=KflagEnum() 10 10 11 macro=14 7;11 macro=149; -
issm/trunk/src/m/enum/LatentHeatEnum.m
r6100 r6130 9 9 % macro=LatentHeatEnum() 10 10 11 macro=27 5;11 macro=277; -
issm/trunk/src/m/enum/LowmemEnum.m
r6100 r6130 9 9 % macro=LowmemEnum() 10 10 11 macro=27 6;11 macro=278; -
issm/trunk/src/m/enum/MassFluxEnum.m
r6100 r6130 9 9 % macro=MassFluxEnum() 10 10 11 macro=15 0;11 macro=152; -
issm/trunk/src/m/enum/MaxAbsVxEnum.m
r6100 r6130 9 9 % macro=MaxAbsVxEnum() 10 10 11 macro=23 4;11 macro=236; -
issm/trunk/src/m/enum/MaxAbsVyEnum.m
r6100 r6130 9 9 % macro=MaxAbsVyEnum() 10 10 11 macro=23 7;11 macro=239; -
issm/trunk/src/m/enum/MaxAbsVzEnum.m
r6100 r6130 9 9 % macro=MaxAbsVzEnum() 10 10 11 macro=24 0;11 macro=242; -
issm/trunk/src/m/enum/MaxIterEnum.m
r6100 r6130 9 9 % macro=MaxIterEnum() 10 10 11 macro=27 7;11 macro=279; -
issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m
r6100 r6130 9 9 % macro=MaxNonlinearIterationsEnum() 10 10 11 macro=2 78;11 macro=280; -
issm/trunk/src/m/enum/MaxPenetrationEnum.m
r6100 r6130 9 9 % macro=MaxPenetrationEnum() 10 10 11 macro=15 7;11 macro=159; -
issm/trunk/src/m/enum/MaxVelEnum.m
r6100 r6130 9 9 % macro=MaxVelEnum() 10 10 11 macro=23 1;11 macro=233; -
issm/trunk/src/m/enum/MaxVxEnum.m
r6100 r6130 9 9 % macro=MaxVxEnum() 10 10 11 macro=23 3;11 macro=235; -
issm/trunk/src/m/enum/MaxVyEnum.m
r6100 r6130 9 9 % macro=MaxVyEnum() 10 10 11 macro=23 6;11 macro=238; -
issm/trunk/src/m/enum/MaxVzEnum.m
r6100 r6130 9 9 % macro=MaxVzEnum() 10 10 11 macro=2 39;11 macro=241; -
issm/trunk/src/m/enum/MeanVelEnum.m
r6100 r6130 9 9 % macro=MeanVelEnum() 10 10 11 macro=1 58;11 macro=160; -
issm/trunk/src/m/enum/MeltingOffsetEnum.m
r6100 r6130 9 9 % macro=MeltingOffsetEnum() 10 10 11 macro=1 59;11 macro=161; -
issm/trunk/src/m/enum/MeltingPointEnum.m
r6100 r6130 9 9 % macro=MeltingPointEnum() 10 10 11 macro=2 79;11 macro=281; -
issm/trunk/src/m/enum/MeltingRateEnum.m
r6100 r6130 9 9 % macro=MeltingRateEnum() 10 10 11 macro=16 0;11 macro=162; -
issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m
r6100 r6130 9 9 % macro=MinMechanicalConstraintsEnum() 10 10 11 macro=28 0;11 macro=282; -
issm/trunk/src/m/enum/MinThermalConstraintsEnum.m
r6100 r6130 9 9 % macro=MinThermalConstraintsEnum() 10 10 11 macro=28 1;11 macro=283; -
issm/trunk/src/m/enum/MinVelEnum.m
r6100 r6130 9 9 % macro=MinVelEnum() 10 10 11 macro=23 0;11 macro=232; -
issm/trunk/src/m/enum/MinVxEnum.m
r6100 r6130 9 9 % macro=MinVxEnum() 10 10 11 macro=23 2;11 macro=234; -
issm/trunk/src/m/enum/MinVyEnum.m
r6100 r6130 9 9 % macro=MinVyEnum() 10 10 11 macro=23 5;11 macro=237; -
issm/trunk/src/m/enum/MinVzEnum.m
r6100 r6130 9 9 % macro=MinVzEnum() 10 10 11 macro=2 38;11 macro=240; -
issm/trunk/src/m/enum/MiniEnum.m
r6100 r6130 9 9 % macro=MiniEnum() 10 10 11 macro=21 3;11 macro=215; -
issm/trunk/src/m/enum/MisfitEnum.m
r6100 r6130 9 9 % macro=MisfitEnum() 10 10 11 macro=16 1;11 macro=163; -
issm/trunk/src/m/enum/MixedLayerCapacityEnum.m
r6100 r6130 9 9 % macro=MixedLayerCapacityEnum() 10 10 11 macro=2 48;11 macro=250; -
issm/trunk/src/m/enum/NStepsEnum.m
r6100 r6130 9 9 % macro=NStepsEnum() 10 10 11 macro=28 2;11 macro=284; -
issm/trunk/src/m/enum/NdtEnum.m
r6100 r6130 9 9 % macro=NdtEnum() 10 10 11 macro=28 3;11 macro=285; -
issm/trunk/src/m/enum/NodalEnum.m
r6100 r6130 9 9 % macro=NodalEnum() 10 10 11 macro=30 5;11 macro=307; -
issm/trunk/src/m/enum/NodeOnBedEnum.m
r6100 r6130 9 9 % macro=NodeOnBedEnum() 10 10 11 macro=16 2;11 macro=164; -
issm/trunk/src/m/enum/NodeOnIceSheetEnum.m
r6100 r6130 9 9 % macro=NodeOnIceSheetEnum() 10 10 11 macro=16 3;11 macro=165; -
issm/trunk/src/m/enum/NodeOnIceShelfEnum.m
r6100 r6130 9 9 % macro=NodeOnIceShelfEnum() 10 10 11 macro=16 4;11 macro=166; -
issm/trunk/src/m/enum/NodeOnSurfaceEnum.m
r6100 r6130 9 9 % macro=NodeOnSurfaceEnum() 10 10 11 macro=16 5;11 macro=167; -
issm/trunk/src/m/enum/NumOutputEnum.m
r6100 r6130 9 9 % macro=NumOutputEnum() 10 10 11 macro=28 4;11 macro=286; -
issm/trunk/src/m/enum/NumRiftsEnum.m
r6100 r6130 9 9 % macro=NumRiftsEnum() 10 10 11 macro=28 5;11 macro=287; -
issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m
r6100 r6130 9 9 % macro=NumberNodeToElementConnectivityEnum() 10 10 11 macro=16 6;11 macro=168; -
issm/trunk/src/m/enum/NumberOfElementsEnum.m
r6100 r6130 9 9 % macro=NumberOfElementsEnum() 10 10 11 macro=28 6;11 macro=288; -
issm/trunk/src/m/enum/NumberOfNodesEnum.m
r6100 r6130 9 9 % macro=NumberOfNodesEnum() 10 10 11 macro=28 7;11 macro=289; -
issm/trunk/src/m/enum/NumberOfVerticesEnum.m
r6100 r6130 9 9 % macro=NumberOfVerticesEnum() 10 10 11 macro=2 88;11 macro=290; -
issm/trunk/src/m/enum/OldGradientEnum.m
r6100 r6130 9 9 % macro=OldGradientEnum() 10 10 11 macro=26 0;11 macro=262; -
issm/trunk/src/m/enum/OptScalEnum.m
r6100 r6130 9 9 % macro=OptScalEnum() 10 10 11 macro=2 89;11 macro=291; -
issm/trunk/src/m/enum/OutputFilePointerEnum.m
r6100 r6130 9 9 % macro=OutputFilePointerEnum() 10 10 11 macro=29 0;11 macro=292; -
issm/trunk/src/m/enum/OutputFrequencyEnum.m
r6100 r6130 9 9 % macro=OutputFrequencyEnum() 10 10 11 macro=2 29;11 macro=231; -
issm/trunk/src/m/enum/P0Enum.m
r6100 r6130 9 9 % macro=P0Enum() 10 10 11 macro=21 0;11 macro=212; -
issm/trunk/src/m/enum/P1DGEnum.m
r6100 r6130 9 9 % macro=P1DGEnum() 10 10 11 macro=21 2;11 macro=214; -
issm/trunk/src/m/enum/P1Enum.m
r6100 r6130 9 9 % macro=P1Enum() 10 10 11 macro=21 1;11 macro=213; -
issm/trunk/src/m/enum/ParameterOutputEnum.m
r6100 r6130 9 9 % macro=ParameterOutputEnum() 10 10 11 macro=29 1;11 macro=293; -
issm/trunk/src/m/enum/PatchEnum.m
r6100 r6130 9 9 % macro=PatchEnum() 10 10 11 macro=22 5;11 macro=227; -
issm/trunk/src/m/enum/PatchNodesEnum.m
r6100 r6130 9 9 % macro=PatchNodesEnum() 10 10 11 macro=22 7;11 macro=229; -
issm/trunk/src/m/enum/PatchVerticesEnum.m
r6100 r6130 9 9 % macro=PatchVerticesEnum() 10 10 11 macro=22 6;11 macro=228; -
issm/trunk/src/m/enum/PenaltyMeltingEnum.m
r6100 r6130 9 9 % macro=PenaltyMeltingEnum() 10 10 11 macro=29 2;11 macro=294; -
issm/trunk/src/m/enum/PenaltyOffsetEnum.m
r6100 r6130 9 9 % macro=PenaltyOffsetEnum() 10 10 11 macro=16 7;11 macro=169; -
issm/trunk/src/m/enum/PentaVertexElementResultEnum.m
r6100 r6130 9 9 % macro=PentaVertexElementResultEnum() 10 10 11 macro=21 6;11 macro=218; -
issm/trunk/src/m/enum/PetscOptionsAnalysesEnum.m
r6100 r6130 9 9 % macro=PetscOptionsAnalysesEnum() 10 10 11 macro=31 4;11 macro=316; -
issm/trunk/src/m/enum/PetscOptionsStringsEnum.m
r6100 r6130 9 9 % macro=PetscOptionsStringsEnum() 10 10 11 macro=31 3;11 macro=315; -
issm/trunk/src/m/enum/PetscRcEnum.m
r6100 r6130 9 9 % macro=PetscRcEnum() 10 10 11 macro=30 7;11 macro=309; -
issm/trunk/src/m/enum/PetscVecExternalResultEnum.m
r6100 r6130 9 9 % macro=PetscVecExternalResultEnum() 10 10 11 macro=22 2;11 macro=224; -
issm/trunk/src/m/enum/PflagEnum.m
r6100 r6130 9 9 % macro=PflagEnum() 10 10 11 macro=1 68;11 macro=170; -
issm/trunk/src/m/enum/PressureEnum.m
r6100 r6130 9 9 % macro=PressureEnum() 10 10 11 macro=1 69;11 macro=171; -
issm/trunk/src/m/enum/PressureOldEnum.m
r6100 r6130 9 9 % macro=PressureOldEnum() 10 10 11 macro=17 0;11 macro=172; -
issm/trunk/src/m/enum/QmuAnalysisEnum.m
r6100 r6130 9 9 % macro=QmuAnalysisEnum() 10 10 11 macro=29 3;11 macro=295; -
issm/trunk/src/m/enum/QmuErrNameEnum.m
r6100 r6130 9 9 % macro=QmuErrNameEnum() 10 10 11 macro=29 4;11 macro=296; -
issm/trunk/src/m/enum/QmuInNameEnum.m
r6100 r6130 9 9 % macro=QmuInNameEnum() 10 10 11 macro=29 5;11 macro=297; -
issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m
r6100 r6130 9 9 % macro=QmuMassFluxSegmentsEnum() 10 10 11 macro=29 6;11 macro=298; -
issm/trunk/src/m/enum/QmuNPartEnum.m
r6100 r6130 9 9 % macro=QmuNPartEnum() 10 10 11 macro=29 7;11 macro=299; -
issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m
r6100 r6130 9 9 % macro=QmuNumberOfResponsesEnum() 10 10 11 macro=30 0;11 macro=302; -
issm/trunk/src/m/enum/QmuOutNameEnum.m
r6100 r6130 9 9 % macro=QmuOutNameEnum() 10 10 11 macro= 298;11 macro=300; -
issm/trunk/src/m/enum/QmuPartEnum.m
r6100 r6130 9 9 % macro=QmuPartEnum() 10 10 11 macro= 299;11 macro=301; -
issm/trunk/src/m/enum/QmuPressureEnum.m
r6100 r6130 9 9 % macro=QmuPressureEnum() 10 10 11 macro=17 1;11 macro=173; -
issm/trunk/src/m/enum/QmuVxEnum.m
r6100 r6130 9 9 % macro=QmuVxEnum() 10 10 11 macro=19 6;11 macro=198; -
issm/trunk/src/m/enum/QmuVyEnum.m
r6100 r6130 9 9 % macro=QmuVyEnum() 10 10 11 macro=20 1;11 macro=203; -
issm/trunk/src/m/enum/QmuVzEnum.m
r6100 r6130 9 9 % macro=QmuVzEnum() 10 10 11 macro=2 08;11 macro=210; -
issm/trunk/src/m/enum/RegularEnum.m
r6100 r6130 9 9 % macro=RegularEnum() 10 10 11 macro=30 2;11 macro=304; -
issm/trunk/src/m/enum/RelativeEnum.m
r6100 r6130 9 9 % macro=RelativeEnum() 10 10 11 macro=24 1;11 macro=243; -
issm/trunk/src/m/enum/ResetPenaltiesEnum.m
r6100 r6130 9 9 % macro=ResetPenaltiesEnum() 10 10 11 macro=17 2;11 macro=174; -
issm/trunk/src/m/enum/ResidualEnum.m
r6100 r6130 9 9 % macro=ResidualEnum() 10 10 11 macro=24 2;11 macro=244; -
issm/trunk/src/m/enum/ResponseDescriptorsEnum.m
r6100 r6130 9 9 % macro=ResponseDescriptorsEnum() 10 10 11 macro=30 6;11 macro=308; -
issm/trunk/src/m/enum/RheologyBEnum.m
r6100 r6130 9 9 % macro=RheologyBEnum() 10 10 11 macro=17 3;11 macro=175; -
issm/trunk/src/m/enum/RheologyBbarEnum.m
r6100 r6130 9 9 % macro=RheologyBbarEnum() 10 10 11 macro=17 4;11 macro=176; -
issm/trunk/src/m/enum/RheologyNEnum.m
r6100 r6130 9 9 % macro=RheologyNEnum() 10 10 11 macro=17 5;11 macro=177; -
issm/trunk/src/m/enum/RhoIceEnum.m
r6100 r6130 9 9 % macro=RhoIceEnum() 10 10 11 macro=24 4;11 macro=246; -
issm/trunk/src/m/enum/RhoWaterEnum.m
r6100 r6130 9 9 % macro=RhoWaterEnum() 10 10 11 macro=24 5;11 macro=247; -
issm/trunk/src/m/enum/ScaledEnum.m
r6100 r6130 9 9 % macro=ScaledEnum() 10 10 11 macro=30 4;11 macro=306; -
issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m
r6100 r6130 9 9 % macro=SegmentOnIceShelfEnum() 10 10 11 macro=17 6;11 macro=178; -
issm/trunk/src/m/enum/SeparateEnum.m
r6100 r6130 9 9 % macro=SeparateEnum() 10 10 11 macro=25 2;11 macro=254; -
issm/trunk/src/m/enum/SparsityEnum.m
r6100 r6130 9 9 % macro=SparsityEnum() 10 10 11 macro=3 08;11 macro=310; -
issm/trunk/src/m/enum/SsetEnum.m
r6100 r6130 9 9 % macro=SsetEnum() 10 10 11 macro=31 7;11 macro=319; -
issm/trunk/src/m/enum/StabilizeConstraintsEnum.m
r6100 r6130 9 9 % macro=StabilizeConstraintsEnum() 10 10 11 macro=17 7;11 macro=179; -
issm/trunk/src/m/enum/StokesReconditioningEnum.m
r6100 r6130 9 9 % macro=StokesReconditioningEnum() 10 10 11 macro=1 78;11 macro=180; -
issm/trunk/src/m/enum/StringExternalResultEnum.m
r6100 r6130 9 9 % macro=StringExternalResultEnum() 10 10 11 macro=22 3;11 macro=225; -
issm/trunk/src/m/enum/StringToEnum.m
r6100 r6130 146 146 elseif (strcmpi(name,'DragType')), enum=DragTypeEnum(); return 147 147 elseif (strcmpi(name,'Dt')), enum=DtEnum(); return 148 elseif (strcmpi(name,'TimeAdapt')), enum=TimeAdaptEnum(); return 149 elseif (strcmpi(name,'CflCoefficient')), enum=CflCoefficientEnum(); return 148 150 elseif (strcmpi(name,'ElementOnBed')), enum=ElementOnBedEnum(); return 149 151 elseif (strcmpi(name,'ElementOnIceShelf')), enum=ElementOnIceShelfEnum(); return -
issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m
r6100 r6130 9 9 % macro=SurfaceAbsVelMisfitEnum() 10 10 11 macro=15 2;11 macro=154; -
issm/trunk/src/m/enum/SurfaceAreaEnum.m
r6100 r6130 9 9 % macro=SurfaceAreaEnum() 10 10 11 macro=1 79;11 macro=181; -
issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m
r6100 r6130 9 9 % macro=SurfaceAverageVelMisfitEnum() 10 10 11 macro=15 6;11 macro=158; -
issm/trunk/src/m/enum/SurfaceEnum.m
r6100 r6130 9 9 % macro=SurfaceEnum() 10 10 11 macro=18 0;11 macro=182; -
issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m
r6100 r6130 9 9 % macro=SurfaceLogVelMisfitEnum() 10 10 11 macro=15 4;11 macro=156; -
issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m
r6100 r6130 9 9 % macro=SurfaceLogVxVyMisfitEnum() 10 10 11 macro=15 5;11 macro=157; -
issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m
r6100 r6130 9 9 % macro=SurfaceRelVelMisfitEnum() 10 10 11 macro=15 3;11 macro=155; -
issm/trunk/src/m/enum/SurfaceSlopeXEnum.m
r6100 r6130 9 9 % macro=SurfaceSlopeXEnum() 10 10 11 macro=18 1;11 macro=183; -
issm/trunk/src/m/enum/SurfaceSlopeYEnum.m
r6100 r6130 9 9 % macro=SurfaceSlopeYEnum() 10 10 11 macro=18 2;11 macro=184; -
issm/trunk/src/m/enum/TemperatureEnum.m
r6100 r6130 9 9 % macro=TemperatureEnum() 10 10 11 macro=18 3;11 macro=185; -
issm/trunk/src/m/enum/TemperatureOldEnum.m
r6100 r6130 9 9 % macro=TemperatureOldEnum() 10 10 11 macro=18 5;11 macro=187; -
issm/trunk/src/m/enum/TemporaryTemperatureEnum.m
r6100 r6130 9 9 % macro=TemporaryTemperatureEnum() 10 10 11 macro=18 4;11 macro=186; -
issm/trunk/src/m/enum/ThermalConductivityEnum.m
r6100 r6130 9 9 % macro=ThermalConductivityEnum() 10 10 11 macro=24 7;11 macro=249; -
issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m
r6100 r6130 9 9 % macro=ThermalExchangeVelocityEnum() 10 10 11 macro=2 49;11 macro=251; -
issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m
r6100 r6130 9 9 % macro=ThicknessAbsMisfitEnum() 10 10 11 macro=15 1;11 macro=153; -
issm/trunk/src/m/enum/ThicknessEnum.m
r6100 r6130 9 9 % macro=ThicknessEnum() 10 10 11 macro=18 6;11 macro=188; -
issm/trunk/src/m/enum/ThicknessObsEnum.m
r6100 r6130 9 9 % macro=ThicknessObsEnum() 10 10 11 macro=18 7;11 macro=189; -
issm/trunk/src/m/enum/TimeEnum.m
r6100 r6130 9 9 % macro=TimeEnum() 10 10 11 macro=2 28;11 macro=230; -
issm/trunk/src/m/enum/TolXEnum.m
r6100 r6130 9 9 % macro=TolXEnum() 10 10 11 macro=3 09;11 macro=311; -
issm/trunk/src/m/enum/TriaVertexElementResultEnum.m
r6100 r6130 9 9 % macro=TriaVertexElementResultEnum() 10 10 11 macro=21 5;11 macro=217; -
issm/trunk/src/m/enum/TypeEnum.m
r6100 r6130 9 9 % macro=TypeEnum() 10 10 11 macro=1 88;11 macro=190; -
issm/trunk/src/m/enum/VariableDescriptorsEnum.m
r6100 r6130 9 9 % macro=VariableDescriptorsEnum() 10 10 11 macro=31 0;11 macro=312; -
issm/trunk/src/m/enum/VelEnum.m
r6100 r6130 9 9 % macro=VelEnum() 10 10 11 macro=1 89;11 macro=191; -
issm/trunk/src/m/enum/VelObsEnum.m
r6100 r6130 9 9 % macro=VelObsEnum() 10 10 11 macro=19 0;11 macro=192; -
issm/trunk/src/m/enum/VerboseEnum.m
r6100 r6130 9 9 % macro=VerboseEnum() 10 10 11 macro=31 1;11 macro=313; -
issm/trunk/src/m/enum/ViscosityOvershootEnum.m
r6100 r6130 9 9 % macro=ViscosityOvershootEnum() 10 10 11 macro=19 1;11 macro=193; -
issm/trunk/src/m/enum/VxAverageEnum.m
r6100 r6130 9 9 % macro=VxAverageEnum() 10 10 11 macro=19 2;11 macro=194; -
issm/trunk/src/m/enum/VxEnum.m
r6100 r6130 9 9 % macro=VxEnum() 10 10 11 macro=19 3;11 macro=195; -
issm/trunk/src/m/enum/VxObsEnum.m
r6100 r6130 9 9 % macro=VxObsEnum() 10 10 11 macro=19 4;11 macro=196; -
issm/trunk/src/m/enum/VxOldEnum.m
r6100 r6130 9 9 % macro=VxOldEnum() 10 10 11 macro=19 5;11 macro=197; -
issm/trunk/src/m/enum/VyAverageEnum.m
r6100 r6130 9 9 % macro=VyAverageEnum() 10 10 11 macro=19 7;11 macro=199; -
issm/trunk/src/m/enum/VyEnum.m
r6100 r6130 9 9 % macro=VyEnum() 10 10 11 macro= 198;11 macro=200; -
issm/trunk/src/m/enum/VyObsEnum.m
r6100 r6130 9 9 % macro=VyObsEnum() 10 10 11 macro= 199;11 macro=201; -
issm/trunk/src/m/enum/VyOldEnum.m
r6100 r6130 9 9 % macro=VyOldEnum() 10 10 11 macro=20 0;11 macro=202; -
issm/trunk/src/m/enum/VzAverageEnum.m
r6100 r6130 9 9 % macro=VzAverageEnum() 10 10 11 macro=20 2;11 macro=204; -
issm/trunk/src/m/enum/VzEnum.m
r6100 r6130 9 9 % macro=VzEnum() 10 10 11 macro=20 3;11 macro=205; -
issm/trunk/src/m/enum/VzObsEnum.m
r6100 r6130 9 9 % macro=VzObsEnum() 10 10 11 macro=20 4;11 macro=206; -
issm/trunk/src/m/enum/VzOldEnum.m
r6100 r6130 9 9 % macro=VzOldEnum() 10 10 11 macro=20 5;11 macro=207; -
issm/trunk/src/m/enum/VzPattynEnum.m
r6100 r6130 9 9 % macro=VzPattynEnum() 10 10 11 macro=20 6;11 macro=208; -
issm/trunk/src/m/enum/VzStokesEnum.m
r6100 r6130 9 9 % macro=VzStokesEnum() 10 10 11 macro=20 7;11 macro=209; -
issm/trunk/src/m/enum/WaitOnLockEnum.m
r6100 r6130 9 9 % macro=WaitOnLockEnum() 10 10 11 macro=31 2;11 macro=314; -
issm/trunk/src/m/enum/WeightsEnum.m
r6100 r6130 9 9 % macro=WeightsEnum() 10 10 11 macro=2 09;11 macro=211; -
issm/trunk/src/m/enum/YtsEnum.m
r6100 r6130 9 9 % macro=YtsEnum() 10 10 11 macro=3 18;11 macro=320; -
issm/trunk/src/m/model/display/displaytransient.m
r1326 r6130 27 27 fielddisplay(md,'timeacc','multiplier to time step when time stepping increases time step'); 28 28 fielddisplay(md,'timedec','multiplier to time step when time stepping decresaes time step'); 29 fielddisplay(md,'time_adapt','compute new time step each iteration, using CFL criterion'); 30 fielddisplay(md,'cfl_coefficient','CFL coefficient'); -
issm/trunk/src/m/model/loadresultsfromcluster.m
r6041 r6130 16 16 17 17 %read log files onto fields 18 md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n')); 19 md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n')); 18 if exist([md.name '.errlog'],'file'), 19 md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n')); 20 else 21 md.errlog=''; 22 end 23 24 if exist([md.name '.outlog'],'file'), 25 md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n')); 26 else 27 md.outlog=''; 28 end 29 20 30 if ~isempty(md.errlog), 21 31 disp(['loadresultsfromcluster info message: error during solution. Check your errlog and outlog model fields']); -
issm/trunk/src/m/model/marshall.m
r6014 r6130 127 127 WriteData(fid,md.dt,'Scalar','dt'); 128 128 WriteData(fid,md.ndt,'Scalar','ndt'); 129 WriteData(fid,md.time_adapt,'Integer','time_adapt'); 130 WriteData(fid,md.cfl_coefficient,'Scalar','cfl_coefficient'); 129 131 WriteData(fid,md.penalty_offset,'Scalar','penalty_offset'); 130 132 WriteData(fid,md.penalty_melting,'Scalar','penalty_melting'); -
issm/trunk/src/m/model/tres.m
r5690 r6130 52 52 elseif strcmpi(string,'dakota'), 53 53 md.dakotaresults=md.results.dakota; 54 55 elseif strcmpi(string,'transient'), 56 results=md.results.Transient2DSolution; 57 results2.Vel=NaN; 58 count=1; 59 for i=1:length(results), 60 if ~isempty(md.results.Transient2DSolution(i).Vel), 61 results2(count).Vel=PatchToVec(md.results.Transient2DSolution(i).Vel); 62 results2(count).Thickness=PatchToVec(md.results.Transient2DSolution(i).Thickness); 63 results2(count).time=md.results.Transient2DSolution(i).time; 64 results2(count).step=md.results.Transient2DSolution(i).step; 65 count=count+1; 66 end 67 end 68 md.results.Transient2DSolution=results2; 69 clear results,results2; 54 70 elseif strcmpi(string,'steadystate'), 55 71 md.vx=PatchToVec(md.results.SteadystateSolution.Vx); -
issm/trunk/src/m/solutions/transient2d_core.m
r5317 r6130 13 13 solution_type=femmodel.parameters.SolutionType; 14 14 output_frequency=femmodel.parameters.OutputFrequency; 15 time_adapt=femmodel.parameters.time_adapt; 15 16 16 17 %Initialize … … 22 23 23 24 %increment 25 if(time_adapt)dt=TimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters); 24 26 step=step+1; 25 27 time=time+dt; -
issm/trunk/src/m/solutions/transient3d_core.m
r5317 r6130 13 13 solution_type=femmodel.parameters.SolutionType; 14 14 output_frequency=femmodel.parameters.OutputFrequency; 15 time_adapt=femmodel.parameters.time_adapt; 15 16 16 17 %Initialize … … 22 23 23 24 %Increment 25 if(time_adapt)dt=TimeAdapt(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters); 24 26 step=step+1; 25 27 time=time+dt; -
issm/trunk/src/m/utils/Model/loadmodel.m
r5208 r6130 27 27 28 28 try, 29 %recover model and name it md 29 30 struc=load(path,'-mat'); 30 31 %get name of model variable32 31 fieldname=char(fieldnames(struc)); 33 32 md=eval(['struc.' fieldname]); 33 34 %now, transform md into a new model 34 35 if ~strcmpi(class(md),'model'), 35 36 md2=model; -
issm/trunk/src/mex/Makefile.am
r5787 r6130 61 61 SystemMatrices\ 62 62 Test\ 63 TimeAdapt\ 63 64 TriaSearch\ 64 65 TriMesh\ … … 265 266 SurfaceArea/SurfaceArea.h 266 267 268 TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\ 269 TimeAdapt/TimeAdapt.h 270 267 271 TriaSearch_SOURCES = TriaSearch/TriaSearch.cpp\ 268 272 TriaSearch/TriaSearch.h
Note:
See TracChangeset
for help on using the changeset viewer.