Changeset 5579
- Timestamp:
- 08/25/10 16:16:07 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 2 deleted
- 324 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r5552 r5579 34 34 DiagnosticVertAnalysisEnum, 35 35 DiagnosticHutterAnalysisEnum, 36 DiagnosticStokesAnalysisEnum,37 36 HorizAnalysisEnum, 38 37 HutterAnalysisEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r5552 r5579 35 35 case DiagnosticVertAnalysisEnum : return "DiagnosticVertAnalysis"; 36 36 case DiagnosticHutterAnalysisEnum : return "DiagnosticHutterAnalysis"; 37 case DiagnosticStokesAnalysisEnum : return "DiagnosticStokesAnalysis";38 37 case HorizAnalysisEnum : return "HorizAnalysis"; 39 38 case HutterAnalysisEnum : return "HutterAnalysis"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r5552 r5579 33 33 else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; 34 34 else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; 35 else if (strcmp(name,"DiagnosticStokesAnalysis")==0) return DiagnosticStokesAnalysisEnum;36 35 else if (strcmp(name,"HorizAnalysis")==0) return HorizAnalysisEnum; 37 36 else if (strcmp(name,"HutterAnalysis")==0) return HutterAnalysisEnum; -
issm/trunk/src/c/Makefile.am
r5578 r5579 361 361 ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \ 362 362 ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\ 363 ./modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp\364 ./modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp \365 ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \366 ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\367 363 ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\ 368 364 ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \ … … 914 910 ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \ 915 911 ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp\ 916 ./modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp\917 ./modules/ModelProcessorx/DiagnosticStokes/CreateNodesDiagnosticStokes.cpp \918 ./modules/ModelProcessorx/DiagnosticStokes/CreateConstraintsDiagnosticStokes.cpp \919 ./modules/ModelProcessorx/DiagnosticStokes/CreateLoadsDiagnosticStokes.cpp\920 912 ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\ 921 913 ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \ -
issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp
r5103 r5579 41 41 CreateLoadsDiagnosticVert(ploads,iomodel,iomodel_handle); 42 42 UpdateElementsDiagnosticVert(elements,iomodel,iomodel_handle,analysis_counter,analysis_type); 43 break;44 45 case DiagnosticStokesAnalysisEnum:46 CreateNodesDiagnosticStokes(pnodes, iomodel,iomodel_handle);47 CreateConstraintsDiagnosticStokes(pconstraints,iomodel,iomodel_handle);48 CreateLoadsDiagnosticStokes(ploads,iomodel,iomodel_handle);49 UpdateElementsDiagnosticStokes(elements,iomodel,iomodel_handle,analysis_counter,analysis_type);50 43 break; 51 44 -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp
r5433 r5579 29 29 30 30 /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */ 31 if (!iomodel->ismacayealpattyn )goto cleanup_and_return;31 if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return; 32 32 33 33 /*Spcs: fetch data: */ … … 36 36 IoModelFetchData(&iomodel->gridonmacayeal,NULL,NULL,iomodel_handle,"gridonmacayeal"); 37 37 if(iomodel->dim==3)IoModelFetchData(&iomodel->gridonpattyn,NULL,NULL,iomodel_handle,"gridonpattyn"); 38 if(iomodel->dim==3)IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes"); 38 39 IoModelFetchData(&iomodel->vertices_type,NULL,NULL,iomodel_handle,"vertices_type"); 40 IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,"surface"); 41 IoModelFetchData(&iomodel->z,NULL,NULL,iomodel_handle,"z"); 39 42 40 43 /*Initialize counter: */ … … 91 94 count++; 92 95 } 96 if ((int)iomodel->spcvelocity[6*i+2] && ((int)iomodel->vertices_type[i]==StokesApproximationEnum || ((int)iomodel->vertices_type[i]==NoneApproximationEnum))){ 97 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,3,*(iomodel->spcvelocity+6*i+5)/iomodel->yts,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy 98 count++; 99 } 100 if ((int)iomodel->vertices_type[i]==NoneApproximationEnum){ 101 constraints->AddObject(new Spc(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,4,iomodel->g*iomodel->rho_ice*(iomodel->surface[i]-iomodel->z[i])/iomodel->stokesreconditioning,DiagnosticHorizAnalysisEnum)); //add count'th spc, on node i+1, setting dof 2 to vy 102 count++; 103 } 93 104 } 94 105 } … … 100 111 xfree((void**)&iomodel->gridonmacayeal); 101 112 xfree((void**)&iomodel->gridonpattyn); 113 xfree((void**)&iomodel->gridonstokes); 102 114 xfree((void**)&iomodel->vertices_type); 103 104 /*penalty loads: */ 105 IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties"); 106 107 /*Initilize counter*/ 108 count=0; 109 110 /*Free data: */ 111 xfree((void**)&iomodel->penalties); 115 xfree((void**)&iomodel->surface); 116 xfree((void**)&iomodel->z); 112 117 113 118 cleanup_and_return: -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp
r5552 r5579 17 17 Icefront* icefront = NULL; 18 18 Riftfront* riftfront= NULL; 19 Pengrid* pengrid = NULL; 19 20 20 21 /*Intermediary*/ … … 32 33 33 34 /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */ 34 if (!iomodel->ismacayealpattyn )goto cleanup_and_return;35 if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return; 35 36 36 37 /*Create pressure loads as boundary conditions. Pay attention to the partitioning if we are running in parallel (the grids … … 86 87 xfree((void**)&iomodel->bed); 87 88 89 /*create penalties for grids on the base of icesheet. We must have wb=ub*db/dx+vb*db/dy */ 90 IoModelFetchData(&iomodel->gridonbed,NULL,NULL,iomodel_handle,"gridonbed"); 91 IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet"); 92 IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes"); 93 IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements"); 94 CreateSingleNodeToElementConnectivity(iomodel); 95 96 for (i=0;i<iomodel->numberofvertices;i++){ 97 98 if(iomodel->my_vertices[i]==1 && iomodel->singlenodetoelementconnectivity[i]!=0){ 99 100 if ((iomodel->gridonbed[i]) && (iomodel->gridonicesheet[i]) && (iomodel->gridonstokes[i])){ 101 102 loads->AddObject(new Pengrid(iomodel->loadcounter+count+1,i,iomodel,DiagnosticHorizAnalysisEnum)); 103 count++; 104 } 105 } //if((iomodel->my_vertices[i]==1)) 106 } 107 108 xfree((void**)&iomodel->gridonbed); 109 xfree((void**)&iomodel->gridonstokes); 110 xfree((void**)&iomodel->gridonicesheet); 111 xfree((void**)&iomodel->elements); 112 xfree((void**)&iomodel->singlenodetoelementconnectivity); 113 88 114 /*Create Penpair for penalties: */ 89 115 IoModelFetchData(&iomodel->penalties,&iomodel->numpenalties,NULL,iomodel_handle,"penalties"); -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp
r5545 r5579 29 29 30 30 /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */ 31 if (!iomodel->ismacayealpattyn )goto cleanup_and_return;31 if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return; 32 32 33 33 /*Continuous Galerkin partition of nodes: */ … … 39 39 IoModelFetchData(&iomodel->gridonhutter,NULL,NULL,iomodel_handle,"gridonhutter"); 40 40 IoModelFetchData(&iomodel->gridonmacayeal,NULL,NULL,iomodel_handle,"gridonmacayeal"); 41 IoModelFetchData(&iomodel->gridonstokes,NULL,NULL,iomodel_handle,"gridonstokes"); 41 42 IoModelFetchData(&iomodel->gridonicesheet,NULL,NULL,iomodel_handle,"gridonicesheet"); 42 43 IoModelFetchData(&iomodel->gridoniceshelf,NULL,NULL,iomodel_handle,"gridoniceshelf"); … … 57 58 xfree((void**)&iomodel->gridonhutter); 58 59 xfree((void**)&iomodel->gridonmacayeal); 60 xfree((void**)&iomodel->gridonstokes); 59 61 xfree((void**)&iomodel->gridonicesheet); 60 62 xfree((void**)&iomodel->gridoniceshelf); -
issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp
r5358 r5579 21 21 22 22 /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */ 23 if (!iomodel->ismacayealpattyn )goto cleanup_and_return;23 if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return; 24 24 25 25 /*Fetch data needed: */ … … 42 42 IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface"); 43 43 IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz"); 44 IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate"); 45 IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate"); 44 46 } 45 47 if(iomodel->control_analysis){ … … 78 80 xfree((void**)&iomodel->elementonsurface); 79 81 xfree((void**)&iomodel->elementonwater); 82 xfree((void**)&iomodel->accumulation_rate); 83 xfree((void**)&iomodel->melting_rate); 80 84 xfree((void**)&iomodel->vx); 81 85 xfree((void**)&iomodel->vy); -
issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp
r5547 r5579 30 30 numdofs=4; 31 31 } 32 else if (vertices_type[0]==NoneApproximationEnum){ 33 numdofs=4; 34 } 32 35 else if (vertices_type[0]==MacAyealPattynApproximationEnum){ 33 36 numdofs=4; … … 42 45 else if (analysis_type==DiagnosticVertAnalysisEnum){ 43 46 numdofs=1; 44 }45 else if (analysis_type==DiagnosticStokesAnalysisEnum){46 numdofs=4;47 47 } 48 48 else if (analysis_type==DiagnosticHutterAnalysisEnum){ -
issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h
r5255 r5579 41 41 void CreateLoadsDiagnosticHutter(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); 42 42 void UpdateElementsDiagnosticHutter(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type); 43 44 /*diagnostic stokes*/45 void CreateNodesDiagnosticStokes(Nodes** pnodes,IoModel* iomodel_handle,ConstDataHandle iomodel_handle);46 void CreateConstraintsDiagnosticStokes(Constraints** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle);47 void CreateLoadsDiagnosticStokes(Loads** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle);48 void UpdateElementsDiagnosticStokes(Elements* elements,IoModel* iomodel_handle,ConstDataHandle iomodel_handle,int analysis_counter,int analysis_type);49 43 50 44 /*bed slope*/ -
issm/trunk/src/c/objects/Elements/Penta.cpp
r5578 r5579 359 359 /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ 360 360 if (analysis_type==DiagnosticHorizAnalysisEnum){ 361 InputUpdateFromSolutionDiagnosticHoriz( solution); 361 int approximation; 362 inputs->GetParameterValue(&approximation,ApproximationEnum); 363 if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){ 364 InputUpdateFromSolutionDiagnosticStokes( solution); 365 } 366 else{ 367 InputUpdateFromSolutionDiagnosticHoriz( solution); 368 } 362 369 } 363 370 else if (analysis_type==DiagnosticHutterAnalysisEnum){ … … 366 373 else if (analysis_type==DiagnosticVertAnalysisEnum){ 367 374 InputUpdateFromSolutionDiagnosticVert( solution); 368 }369 else if (analysis_type==DiagnosticStokesAnalysisEnum){370 InputUpdateFromSolutionDiagnosticStokes( solution);371 375 } 372 376 else if (analysis_type==AdjointHorizAnalysisEnum){ … … 514 518 /*flags: */ 515 519 bool onbed; 520 int approximation; 516 521 Input* pressure_input=NULL; 517 522 Input* vx_input=NULL; … … 524 529 /*retrive parameters: */ 525 530 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 531 inputs->GetParameterValue(&approximation,ApproximationEnum); 526 532 527 533 /*Check analysis_types*/ 528 if (analysis_type!=DiagnosticStokesAnalysisEnum) ISSMERROR("Not supported yet!"); 534 if (analysis_type!=DiagnosticHorizAnalysisEnum) ISSMERROR("Not supported yet!"); 535 if (approximation!=StokesApproximationEnum) ISSMERROR("Not supported yet!"); 529 536 530 537 /*recover some inputs: */ … … 780 787 return; 781 788 } 789 else if(approximation==NoneApproximationEnum){ 790 return; 791 } 782 792 else if(approximation==MacAyealPattynApproximationEnum){ 783 793 CreateKMatrixDiagnosticMacAyeal( Kgg); … … 805 815 CreateKMatrixDiagnosticVert( Kgg); 806 816 } 807 else if (analysis_type==DiagnosticStokesAnalysisEnum){808 CreateKMatrixDiagnosticStokes( Kgg);809 }810 817 else if (analysis_type==AdjointStokesAnalysisEnum){ 811 818 /*Same as diagnostic*/ … … 858 865 return; 859 866 } 867 else if(approximation==NoneApproximationEnum){ 868 return; 869 } 860 870 else if(approximation==StokesApproximationEnum){ 861 871 CreatePVectorDiagnosticStokes( pg); … … 884 894 CreatePVectorDiagnosticVert( pg); 885 895 } 886 else if (analysis_type==DiagnosticStokesAnalysisEnum){887 CreatePVectorDiagnosticStokes( pg);888 }889 896 else if (analysis_type==AdjointStokesAnalysisEnum){ 890 897 CreatePVectorAdjointStokes( pg); … … 981 988 /*Just branch to the correct InputUpdateFromSolution generator, according to the type of analysis we are carrying out: */ 982 989 if (analysis_type==DiagnosticHorizAnalysisEnum){ 983 GetSolutionFromInputsDiagnosticHoriz(solution); 990 int approximation; 991 inputs->GetParameterValue(&approximation,ApproximationEnum); 992 if(approximation==StokesApproximationEnum || approximation==NoneApproximationEnum){ 993 GetSolutionFromInputsDiagnosticStokes(solution); 994 } 995 else{ 996 GetSolutionFromInputsDiagnosticHoriz(solution); 997 } 984 998 } 985 999 else if(analysis_type==DiagnosticHutterAnalysisEnum){ … … 988 1002 else if(analysis_type==DiagnosticVertAnalysisEnum){ 989 1003 GetSolutionFromInputsDiagnosticVert(solution); 990 }991 else if(analysis_type==DiagnosticStokesAnalysisEnum){992 GetSolutionFromInputsDiagnosticStokes(solution);993 1004 } 994 1005 else if(analysis_type==ThermalAnalysisEnum){ … … 1297 1308 input=this->inputs->GetInput(enum_type); 1298 1309 } 1299 if (!input) ISSMERROR("Input %s not found in tria->inputs",EnumToString(enum_type));1310 if (!input) ISSMERROR("Input %s not found in penta->inputs",EnumToString(enum_type)); 1300 1311 1301 1312 /*If we don't find it, no big deal, just don't do the transfer. Otherwise, build a new Result … … 2157 2168 switch(analysis_type){ 2158 2169 2159 case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: case DiagnosticStokesAnalysisEnum:2170 case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: 2160 2171 2161 2172 /*default vx,vy and vz: either observation or 0 */ -
issm/trunk/src/c/objects/Elements/Tria.cpp
r5578 r5579 2938 2938 switch(analysis_type){ 2939 2939 2940 case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: case DiagnosticStokesAnalysisEnum:2940 case DiagnosticHorizAnalysisEnum: case DiagnosticVertAnalysisEnum: 2941 2941 2942 2942 /*default vx,vy and vz: either observation or 0 */ -
issm/trunk/src/c/objects/Loads/Icefront.cpp
r5552 r5579 306 306 } 307 307 else ISSMERROR("Icefront type %s not supported yet",EnumToString(type)); 308 }309 else if (analysis_type==DiagnosticStokesAnalysisEnum){310 CreatePVectorDiagnosticStokes( pg);311 308 } 312 309 else if (analysis_type==AdjointHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){ -
issm/trunk/src/c/objects/Loads/Pengrid.cpp
r5523 r5579 285 285 this->parameters->FindParam(&analysis_type,AnalysisTypeEnum); 286 286 287 if (analysis_type==Diagnostic StokesAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){287 if (analysis_type==DiagnosticHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){ 288 288 PenaltyCreateKMatrixDiagnosticStokes( Kgg,kmax); 289 289 } … … 314 314 PenaltyCreatePVectorMelting( pg,kmax); 315 315 } 316 else if (analysis_type==Diagnostic StokesAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){316 else if (analysis_type==DiagnosticHorizAnalysisEnum || analysis_type==AdjointStokesAnalysisEnum){ 317 317 318 318 /*No loads applied, do nothing: */ … … 459 459 this->parameters->FindParam(&analysis_type,AnalysisTypeEnum); 460 460 461 if (analysis_type==Diagnostic StokesAnalysisEnum){461 if (analysis_type==DiagnosticHorizAnalysisEnum){ 462 462 /*No penalty to check*/ 463 463 return; -
issm/trunk/src/c/objects/Loads/Penpair.cpp
r5557 r5579 237 237 } 238 238 } 239 else if (analysis_type==DiagnosticStokesAnalysisEnum){240 PenaltyCreateKMatrixDiagnosticStokes(Kgg,kmax);241 }242 239 else{ 243 240 ISSMERROR("analysis %i (%s) not supported yet",analysis_type,EnumToString(analysis_type)); … … 354 351 Ke[5][5]=kmax*pow((double)10.0,penalty_offset); 355 352 356 Ke[2][2]=kmax*pow((double)10.0,penalty_offset);357 Ke[2][6]=-kmax*pow((double)10.0,penalty_offset);358 Ke[6][2]=-kmax*pow((double)10.0,penalty_offset);359 Ke[6][6]=kmax*pow((double)10.0,penalty_offset);360 361 Ke[3][3]=kmax*pow((double)10.0,penalty_offset);362 Ke[3][7]=-kmax*pow((double)10.0,penalty_offset);363 Ke[7][3]=-kmax*pow((double)10.0,penalty_offset);364 Ke[7][7]=kmax*pow((double)10.0,penalty_offset);353 // Ke[2][2]=kmax*pow((double)10.0,penalty_offset); 354 // Ke[2][6]=-kmax*pow((double)10.0,penalty_offset); 355 // Ke[6][2]=-kmax*pow((double)10.0,penalty_offset); 356 // Ke[6][6]=kmax*pow((double)10.0,penalty_offset); 357 358 // Ke[3][3]=kmax*pow((double)10.0,penalty_offset); 359 // Ke[3][7]=-kmax*pow((double)10.0,penalty_offset); 360 // Ke[7][3]=-kmax*pow((double)10.0,penalty_offset); 361 // Ke[7][7]=kmax*pow((double)10.0,penalty_offset); 365 362 366 363 /*Add Ke to global matrix Kgg: */ -
issm/trunk/src/c/solutions/SolutionConfiguration.cpp
r5247 r5579 33 33 34 34 case DiagnosticSolutionEnum: 35 numanalyses= 6;35 numanalyses=5; 36 36 analyses=(int*)xmalloc(numanalyses*sizeof(int)); 37 37 analyses[0]=DiagnosticHorizAnalysisEnum; 38 38 analyses[1]=DiagnosticVertAnalysisEnum; 39 analyses[2]=DiagnosticStokesAnalysisEnum; 40 analyses[3]=DiagnosticHutterAnalysisEnum; 41 analyses[4]=SurfaceSlopeAnalysisEnum; 42 analyses[5]=BedSlopeAnalysisEnum; 39 analyses[2]=DiagnosticHutterAnalysisEnum; 40 analyses[3]=SurfaceSlopeAnalysisEnum; 41 analyses[4]=BedSlopeAnalysisEnum; 43 42 break; 44 43 45 44 case SteadystateSolutionEnum: 46 numanalyses= 8;45 numanalyses=7; 47 46 analyses=(int*)xmalloc(numanalyses*sizeof(int)); 48 47 analyses[0]=DiagnosticHorizAnalysisEnum; 49 48 analyses[1]=DiagnosticVertAnalysisEnum; 50 analyses[2]=DiagnosticStokesAnalysisEnum; 51 analyses[3]=DiagnosticHutterAnalysisEnum; 52 analyses[4]=SurfaceSlopeAnalysisEnum; 53 analyses[5]=BedSlopeAnalysisEnum; 54 analyses[6]=ThermalAnalysisEnum; 55 analyses[7]=MeltingAnalysisEnum; 49 analyses[2]=DiagnosticHutterAnalysisEnum; 50 analyses[3]=SurfaceSlopeAnalysisEnum; 51 analyses[4]=BedSlopeAnalysisEnum; 52 analyses[5]=ThermalAnalysisEnum; 53 analyses[6]=MeltingAnalysisEnum; 56 54 break; 57 55 … … 94 92 95 93 case Transient2DSolutionEnum: 96 numanalyses= 7;94 numanalyses=6; 97 95 analyses=(int*)xmalloc(numanalyses*sizeof(int)); 98 96 analyses[0]=DiagnosticHorizAnalysisEnum; 99 97 analyses[1]=DiagnosticVertAnalysisEnum; 100 analyses[2]=DiagnosticStokesAnalysisEnum; 101 analyses[3]=DiagnosticHutterAnalysisEnum; 102 analyses[4]=SurfaceSlopeAnalysisEnum; 103 analyses[5]=BedSlopeAnalysisEnum; 104 analyses[6]=PrognosticAnalysisEnum; 98 analyses[2]=DiagnosticHutterAnalysisEnum; 99 analyses[3]=SurfaceSlopeAnalysisEnum; 100 analyses[4]=BedSlopeAnalysisEnum; 101 analyses[5]=PrognosticAnalysisEnum; 105 102 break; 106 103 107 104 case Transient3DSolutionEnum: 108 numanalyses= 9;105 numanalyses=8; 109 106 analyses=(int*)xmalloc(numanalyses*sizeof(int)); 110 107 analyses[0]=DiagnosticHorizAnalysisEnum; 111 108 analyses[1]=DiagnosticVertAnalysisEnum; 112 analyses[2]=DiagnosticStokesAnalysisEnum; 113 analyses[3]=DiagnosticHutterAnalysisEnum; 114 analyses[4]=SurfaceSlopeAnalysisEnum; 115 analyses[5]=BedSlopeAnalysisEnum; 116 analyses[6]=PrognosticAnalysisEnum; 117 analyses[7]=ThermalAnalysisEnum; 118 analyses[8]=MeltingAnalysisEnum; 109 analyses[2]=DiagnosticHutterAnalysisEnum; 110 analyses[3]=SurfaceSlopeAnalysisEnum; 111 analyses[4]=BedSlopeAnalysisEnum; 112 analyses[5]=PrognosticAnalysisEnum; 113 analyses[6]=ThermalAnalysisEnum; 114 analyses[7]=MeltingAnalysisEnum; 119 115 break; 120 116 -
issm/trunk/src/c/solutions/adjointdiagnostic_core.cpp
r5414 r5579 29 29 /*Compute velocities*/ 30 30 _printf_("%s\n"," computing velocities"); 31 if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum); 32 else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); 31 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); 33 32 solver_diagnostic_nonlinear(femmodel,conserve_loads); 34 33 … … 38 37 /*Compute adjoint*/ 39 38 _printf_("%s\n"," computing adjoint"); 40 if(isstokes)femmodel->SetCurrentConfiguration(Diagnostic StokesAnalysisEnum,AdjointStokesAnalysisEnum);39 if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointStokesAnalysisEnum); 41 40 else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum); 42 41 solver_adjoint_linear(femmodel); -
issm/trunk/src/c/solutions/diagnostic_core.cpp
r5437 r5579 81 81 82 82 if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ..."); 83 femmodel->SetCurrentConfiguration(Diagnostic StokesAnalysisEnum);83 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); 84 84 solver_diagnostic_nonlinear(femmodel,conserve_loads); 85 85 } -
issm/trunk/src/c/solutions/objectivefunctionC.cpp
r5281 r5579 53 53 /*set analysis type to compute velocity: */ 54 54 if (solution_type==SteadystateSolutionEnum || solution_type==DiagnosticSolutionEnum){ 55 if(isstokes)femmodel->SetCurrentConfiguration(DiagnosticStokesAnalysisEnum); 56 else femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); 55 femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum); 57 56 } 58 57 else if (solution_type==BalancedthicknessSolutionEnum){ -
issm/trunk/src/m/enum/AbsoluteEnum.m
r5553 r5579 9 9 % macro=AbsoluteEnum() 10 10 11 macro=24 8;11 macro=247; -
issm/trunk/src/m/enum/AccumulationRateEnum.m
r5553 r5579 9 9 % macro=AccumulationRateEnum() 10 10 11 macro=11 9;11 macro=118; -
issm/trunk/src/m/enum/AdjointBalancedthicknessAnalysisEnum.m
r5226 r5579 9 9 % macro=AdjointBalancedthicknessAnalysisEnum() 10 10 11 macro=2 7;11 macro=26; -
issm/trunk/src/m/enum/AdjointEnum.m
r5553 r5579 9 9 % macro=AdjointEnum() 10 10 11 macro=26 3;11 macro=262; -
issm/trunk/src/m/enum/AdjointHorizAnalysisEnum.m
r4475 r5579 9 9 % macro=AdjointHorizAnalysisEnum() 10 10 11 macro=2 5;11 macro=24; -
issm/trunk/src/m/enum/AdjointSolutionEnum.m
r4359 r5579 9 9 % macro=AdjointSolutionEnum() 10 10 11 macro=2 4;11 macro=23; -
issm/trunk/src/m/enum/AdjointStokesAnalysisEnum.m
r4475 r5579 9 9 % macro=AdjointStokesAnalysisEnum() 10 10 11 macro=2 6;11 macro=25; -
issm/trunk/src/m/enum/AdjointpEnum.m
r5553 r5579 9 9 % macro=AdjointpEnum() 10 10 11 macro=12 3;11 macro=122; -
issm/trunk/src/m/enum/AdjointxEnum.m
r5553 r5579 9 9 % macro=AdjointxEnum() 10 10 11 macro=1 20;11 macro=119; -
issm/trunk/src/m/enum/AdjointyEnum.m
r5553 r5579 9 9 % macro=AdjointyEnum() 10 10 11 macro=12 1;11 macro=120; -
issm/trunk/src/m/enum/AdjointzEnum.m
r5553 r5579 9 9 % macro=AdjointzEnum() 10 10 11 macro=12 2;11 macro=121; -
issm/trunk/src/m/enum/AirEnum.m
r5553 r5579 9 9 % macro=AirEnum() 10 10 11 macro=11 7;11 macro=116; -
issm/trunk/src/m/enum/ApproximationEnum.m
r5226 r5579 9 9 % macro=ApproximationEnum() 10 10 11 macro=5 9;11 macro=58; -
issm/trunk/src/m/enum/ArtDiffEnum.m
r5553 r5579 9 9 % macro=ArtDiffEnum() 10 10 11 macro=12 4;11 macro=123; -
issm/trunk/src/m/enum/BalancedthicknessAnalysisEnum.m
r5226 r5579 9 9 % macro=BalancedthicknessAnalysisEnum() 10 10 11 macro=4 8;11 macro=47; -
issm/trunk/src/m/enum/BalancedthicknessSolutionEnum.m
r5226 r5579 9 9 % macro=BalancedthicknessSolutionEnum() 10 10 11 macro=4 7;11 macro=46; -
issm/trunk/src/m/enum/BalancedvelocitiesAnalysisEnum.m
r5226 r5579 9 9 % macro=BalancedvelocitiesAnalysisEnum() 10 10 11 macro= 50;11 macro=49; -
issm/trunk/src/m/enum/BalancedvelocitiesSolutionEnum.m
r5226 r5579 9 9 % macro=BalancedvelocitiesSolutionEnum() 10 10 11 macro=4 9;11 macro=48; -
issm/trunk/src/m/enum/BedEnum.m
r5553 r5579 9 9 % macro=BedEnum() 10 10 11 macro=12 5;11 macro=124; -
issm/trunk/src/m/enum/BedSlopeAnalysisEnum.m
r5226 r5579 9 9 % macro=BedSlopeAnalysisEnum() 10 10 11 macro= 40;11 macro=39; -
issm/trunk/src/m/enum/BedSlopeSolutionEnum.m
r5226 r5579 9 9 % macro=BedSlopeSolutionEnum() 10 10 11 macro=3 9;11 macro=38; -
issm/trunk/src/m/enum/BedSlopeXAnalysisEnum.m
r5226 r5579 9 9 % macro=BedSlopeXAnalysisEnum() 10 10 11 macro=4 3;11 macro=42; -
issm/trunk/src/m/enum/BedSlopeXEnum.m
r5553 r5579 9 9 % macro=BedSlopeXEnum() 10 10 11 macro=12 6;11 macro=125; -
issm/trunk/src/m/enum/BedSlopeYAnalysisEnum.m
r5226 r5579 9 9 % macro=BedSlopeYAnalysisEnum() 10 10 11 macro=4 4;11 macro=43; -
issm/trunk/src/m/enum/BedSlopeYEnum.m
r5553 r5579 9 9 % macro=BedSlopeYEnum() 10 10 11 macro=12 7;11 macro=126; -
issm/trunk/src/m/enum/BetaEnum.m
r5553 r5579 9 9 % macro=BetaEnum() 10 10 11 macro=25 8;11 macro=257; -
issm/trunk/src/m/enum/BoolExternalResultEnum.m
r5553 r5579 9 9 % macro=BoolExternalResultEnum() 10 10 11 macro=22 2;11 macro=221; -
issm/trunk/src/m/enum/BoolInputEnum.m
r5553 r5579 9 9 % macro=BoolInputEnum() 10 10 11 macro=9 2;11 macro=91; -
issm/trunk/src/m/enum/BoolParamEnum.m
r5553 r5579 9 9 % macro=BoolParamEnum() 10 10 11 macro=9 8;11 macro=97; -
issm/trunk/src/m/enum/BoundaryEnum.m
r5553 r5579 9 9 % macro=BoundaryEnum() 10 10 11 macro=12 8;11 macro=127; -
issm/trunk/src/m/enum/CmGradientEnum.m
r5553 r5579 9 9 % macro=CmGradientEnum() 10 10 11 macro=25 9;11 macro=258; -
issm/trunk/src/m/enum/CmJumpEnum.m
r5553 r5579 9 9 % macro=CmJumpEnum() 10 10 11 macro=2 60;11 macro=259; -
issm/trunk/src/m/enum/CmMaxDmpSlopeEnum.m
r5553 r5579 9 9 % macro=CmMaxDmpSlopeEnum() 10 10 11 macro=13 1;11 macro=130; -
issm/trunk/src/m/enum/CmMaxDmpValueEnum.m
r5553 r5579 9 9 % macro=CmMaxDmpValueEnum() 10 10 11 macro=13 2;11 macro=131; -
issm/trunk/src/m/enum/CmMaxEnum.m
r5553 r5579 9 9 % macro=CmMaxEnum() 10 10 11 macro=26 1;11 macro=260; -
issm/trunk/src/m/enum/CmMinDmpSlopeEnum.m
r5553 r5579 9 9 % macro=CmMinDmpSlopeEnum() 10 10 11 macro=13 3;11 macro=132; -
issm/trunk/src/m/enum/CmMinDmpValueEnum.m
r5553 r5579 9 9 % macro=CmMinDmpValueEnum() 10 10 11 macro=13 4;11 macro=133; -
issm/trunk/src/m/enum/CmMinEnum.m
r5553 r5579 9 9 % macro=CmMinEnum() 10 10 11 macro=26 2;11 macro=261; -
issm/trunk/src/m/enum/CmNoiseDmpEnum.m
r5553 r5579 9 9 % macro=CmNoiseDmpEnum() 10 10 11 macro=13 5;11 macro=134; -
issm/trunk/src/m/enum/CmResponseEnum.m
r5553 r5579 9 9 % macro=CmResponseEnum() 10 10 11 macro=12 9;11 macro=128; -
issm/trunk/src/m/enum/CmResponsesEnum.m
r5553 r5579 9 9 % macro=CmResponsesEnum() 10 10 11 macro=1 30;11 macro=129; -
issm/trunk/src/m/enum/ColinearEnum.m
r5553 r5579 9 9 % macro=ColinearEnum() 10 10 11 macro=25 6;11 macro=255; -
issm/trunk/src/m/enum/ConnectivityEnum.m
r5553 r5579 9 9 % macro=ConnectivityEnum() 10 10 11 macro=26 6;11 macro=265; -
issm/trunk/src/m/enum/ConstantEnum.m
r5553 r5579 9 9 % macro=ConstantEnum() 10 10 11 macro=13 6;11 macro=135; -
issm/trunk/src/m/enum/ControlAnalysisEnum.m
r5226 r5579 9 9 % macro=ControlAnalysisEnum() 10 10 11 macro=2 8;11 macro=27; -
issm/trunk/src/m/enum/ControlParameterEnum.m
r5553 r5579 9 9 % macro=ControlParameterEnum() 10 10 11 macro=26 7;11 macro=266; -
issm/trunk/src/m/enum/ControlSteadyEnum.m
r5553 r5579 9 9 % macro=ControlSteadyEnum() 10 10 11 macro=26 8;11 macro=267; -
issm/trunk/src/m/enum/ControlTypeEnum.m
r5553 r5579 9 9 % macro=ControlTypeEnum() 10 10 11 macro=13 7;11 macro=136; -
issm/trunk/src/m/enum/ConvergedEnum.m
r5553 r5579 9 9 % macro=ConvergedEnum() 10 10 11 macro=13 8;11 macro=137; -
issm/trunk/src/m/enum/DakotaParameterEnum.m
r5553 r5579 9 9 % macro=DakotaParameterEnum() 10 10 11 macro=26 9;11 macro=268; -
issm/trunk/src/m/enum/DhDtEnum.m
r5553 r5579 9 9 % macro=DhDtEnum() 10 10 11 macro=13 9;11 macro=138; -
issm/trunk/src/m/enum/DimEnum.m
r5553 r5579 9 9 % macro=DimEnum() 10 10 11 macro=2 70;11 macro=269; -
issm/trunk/src/m/enum/DofIndexingEnum.m
r5226 r5579 9 9 % macro=DofIndexingEnum() 10 10 11 macro= 70;11 macro=69; -
issm/trunk/src/m/enum/DoubleElementResultEnum.m
r5553 r5579 9 9 % macro=DoubleElementResultEnum() 10 10 11 macro=21 9;11 macro=218; -
issm/trunk/src/m/enum/DoubleExternalResultEnum.m
r5553 r5579 9 9 % macro=DoubleExternalResultEnum() 10 10 11 macro=22 3;11 macro=222; -
issm/trunk/src/m/enum/DoubleInputEnum.m
r5553 r5579 9 9 % macro=DoubleInputEnum() 10 10 11 macro=9 3;11 macro=92; -
issm/trunk/src/m/enum/DoubleMatArrayParamEnum.m
r5553 r5579 9 9 % macro=DoubleMatArrayParamEnum() 10 10 11 macro= 100;11 macro=99; -
issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m
r5553 r5579 9 9 % macro=DoubleMatExternalResultEnum() 10 10 11 macro=22 5;11 macro=224; -
issm/trunk/src/m/enum/DoubleMatParamEnum.m
r5553 r5579 9 9 % macro=DoubleMatParamEnum() 10 10 11 macro=9 9;11 macro=98; -
issm/trunk/src/m/enum/DoubleParamEnum.m
r5553 r5579 9 9 % macro=DoubleParamEnum() 10 10 11 macro=10 1;11 macro=100; -
issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m
r5553 r5579 9 9 % macro=DoubleVecExternalResultEnum() 10 10 11 macro=22 4;11 macro=223; -
issm/trunk/src/m/enum/DoubleVecParamEnum.m
r5553 r5579 9 9 % macro=DoubleVecParamEnum() 10 10 11 macro=10 2;11 macro=101; -
issm/trunk/src/m/enum/DragCoefficientEnum.m
r5553 r5579 9 9 % macro=DragCoefficientEnum() 10 10 11 macro=1 40;11 macro=139; -
issm/trunk/src/m/enum/DragPEnum.m
r5553 r5579 9 9 % macro=DragPEnum() 10 10 11 macro=14 1;11 macro=140; -
issm/trunk/src/m/enum/DragQEnum.m
r5553 r5579 9 9 % macro=DragQEnum() 10 10 11 macro=14 2;11 macro=141; -
issm/trunk/src/m/enum/DragTypeEnum.m
r5553 r5579 9 9 % macro=DragTypeEnum() 10 10 11 macro=14 3;11 macro=142; -
issm/trunk/src/m/enum/DtEnum.m
r5553 r5579 9 9 % macro=DtEnum() 10 10 11 macro=14 4;11 macro=143; -
issm/trunk/src/m/enum/ElementEnum.m
r5226 r5579 9 9 % macro=ElementEnum() 10 10 11 macro=6 9;11 macro=68; -
issm/trunk/src/m/enum/ElementOnBedEnum.m
r5553 r5579 9 9 % macro=ElementOnBedEnum() 10 10 11 macro=14 5;11 macro=144; -
issm/trunk/src/m/enum/ElementOnIceShelfEnum.m
r5553 r5579 9 9 % macro=ElementOnIceShelfEnum() 10 10 11 macro=14 6;11 macro=145; -
issm/trunk/src/m/enum/ElementOnSurfaceEnum.m
r5553 r5579 9 9 % macro=ElementOnSurfaceEnum() 10 10 11 macro=14 7;11 macro=146; -
issm/trunk/src/m/enum/ElementOnWaterEnum.m
r5553 r5579 9 9 % macro=ElementOnWaterEnum() 10 10 11 macro=14 8;11 macro=147; -
issm/trunk/src/m/enum/ElementPropertiesEnum.m
r5226 r5579 9 9 % macro=ElementPropertiesEnum() 10 10 11 macro=7 1;11 macro=70; -
issm/trunk/src/m/enum/ElementResultEnum.m
r5553 r5579 9 9 % macro=ElementResultEnum() 10 10 11 macro=10 9;11 macro=108; -
issm/trunk/src/m/enum/EnumToString.m
r5553 r5579 30 30 case DiagnosticVertAnalysisEnum(), string='DiagnosticVertAnalysis'; return 31 31 case DiagnosticHutterAnalysisEnum(), string='DiagnosticHutterAnalysis'; return 32 case DiagnosticStokesAnalysisEnum(), string='DiagnosticStokesAnalysis'; return33 32 case HorizAnalysisEnum(), string='HorizAnalysis'; return 34 33 case HutterAnalysisEnum(), string='HutterAnalysis'; return -
issm/trunk/src/m/enum/EpsAbsEnum.m
r5553 r5579 9 9 % macro=EpsAbsEnum() 10 10 11 macro=27 1;11 macro=270; -
issm/trunk/src/m/enum/EpsCmEnum.m
r5553 r5579 9 9 % macro=EpsCmEnum() 10 10 11 macro=27 2;11 macro=271; -
issm/trunk/src/m/enum/EpsRelEnum.m
r5553 r5579 9 9 % macro=EpsRelEnum() 10 10 11 macro=27 3;11 macro=272; -
issm/trunk/src/m/enum/EpsResEnum.m
r5553 r5579 9 9 % macro=EpsResEnum() 10 10 11 macro=27 4;11 macro=273; -
issm/trunk/src/m/enum/EpsVelEnum.m
r5553 r5579 9 9 % macro=EpsVelEnum() 10 10 11 macro=14 9;11 macro=148; -
issm/trunk/src/m/enum/ExtToIuEnum.m
r5553 r5579 9 9 % macro=ExtToIuEnum() 10 10 11 macro=15 7;11 macro=156; -
issm/trunk/src/m/enum/ExternalResultEnum.m
r5553 r5579 9 9 % macro=ExternalResultEnum() 10 10 11 macro=1 10;11 macro=109; -
issm/trunk/src/m/enum/FileParamEnum.m
r5553 r5579 9 9 % macro=FileParamEnum() 10 10 11 macro=10 4;11 macro=103; -
issm/trunk/src/m/enum/FillEnum.m
r5553 r5579 9 9 % macro=FillEnum() 10 10 11 macro=1 50;11 macro=149; -
issm/trunk/src/m/enum/FractionIncrementEnum.m
r5553 r5579 9 9 % macro=FractionIncrementEnum() 10 10 11 macro=15 1;11 macro=150; -
issm/trunk/src/m/enum/FrictionEnum.m
r5553 r5579 9 9 % macro=FrictionEnum() 10 10 11 macro=15 2;11 macro=151; -
issm/trunk/src/m/enum/GeographyEnum.m
r5553 r5579 9 9 % macro=GeographyEnum() 10 10 11 macro=11 2;11 macro=111; -
issm/trunk/src/m/enum/GeothermalFluxEnum.m
r5553 r5579 9 9 % macro=GeothermalFluxEnum() 10 10 11 macro=15 3;11 macro=152; -
issm/trunk/src/m/enum/GradientAnalysisEnum.m
r5226 r5579 9 9 % macro=GradientAnalysisEnum() 10 10 11 macro=2 9;11 macro=28; -
issm/trunk/src/m/enum/GradientEnum.m
r5553 r5579 9 9 % macro=GradientEnum() 10 10 11 macro=26 4;11 macro=263; -
issm/trunk/src/m/enum/GravityEnum.m
r5553 r5579 9 9 % macro=GravityEnum() 10 10 11 macro=25 1;11 macro=250; -
issm/trunk/src/m/enum/HeatCapacityEnum.m
r5553 r5579 9 9 % macro=HeatCapacityEnum() 10 10 11 macro=27 5;11 macro=274; -
issm/trunk/src/m/enum/HookEnum.m
r5226 r5579 9 9 % macro=HookEnum() 10 10 11 macro=6 7;11 macro=66; -
issm/trunk/src/m/enum/HorizAnalysisEnum.m
r4359 r5579 9 9 % macro=HorizAnalysisEnum() 10 10 11 macro= 20;11 macro=19; -
issm/trunk/src/m/enum/HutterAnalysisEnum.m
r4359 r5579 9 9 % macro=HutterAnalysisEnum() 10 10 11 macro=2 1;11 macro=20; -
issm/trunk/src/m/enum/HutterApproximationEnum.m
r5226 r5579 9 9 % macro=HutterApproximationEnum() 10 10 11 macro= 60;11 macro=59; -
issm/trunk/src/m/enum/IceEnum.m
r5553 r5579 9 9 % macro=IceEnum() 10 10 11 macro=11 6;11 macro=115; -
issm/trunk/src/m/enum/IceSheetEnum.m
r5553 r5579 9 9 % macro=IceSheetEnum() 10 10 11 macro=11 3;11 macro=112; -
issm/trunk/src/m/enum/IceShelfEnum.m
r5553 r5579 9 9 % macro=IceShelfEnum() 10 10 11 macro=11 4;11 macro=113; -
issm/trunk/src/m/enum/IcefrontEnum.m
r5226 r5579 9 9 % macro=IcefrontEnum() 10 10 11 macro=7 8;11 macro=77; -
issm/trunk/src/m/enum/IndexEnum.m
r5553 r5579 9 9 % macro=IndexEnum() 10 10 11 macro=30 7;11 macro=306; -
issm/trunk/src/m/enum/IndexedEnum.m
r5553 r5579 9 9 % macro=IndexedEnum() 10 10 11 macro=30 5;11 macro=304; -
issm/trunk/src/m/enum/InputEnum.m
r5553 r5579 9 9 % macro=InputEnum() 10 10 11 macro=9 1;11 macro=90; -
issm/trunk/src/m/enum/IntExternalResultEnum.m
r5553 r5579 9 9 % macro=IntExternalResultEnum() 10 10 11 macro=22 6;11 macro=225; -
issm/trunk/src/m/enum/IntInputEnum.m
r5553 r5579 9 9 % macro=IntInputEnum() 10 10 11 macro=9 4;11 macro=93; -
issm/trunk/src/m/enum/IntParamEnum.m
r5553 r5579 9 9 % macro=IntParamEnum() 10 10 11 macro=10 3;11 macro=102; -
issm/trunk/src/m/enum/InternalEnum.m
r5553 r5579 9 9 % macro=InternalEnum() 10 10 11 macro=15 4;11 macro=153; -
issm/trunk/src/m/enum/IntersectEnum.m
r5553 r5579 9 9 % macro=IntersectEnum() 10 10 11 macro=25 5;11 macro=254; -
issm/trunk/src/m/enum/InverseAnalysisEnum.m
r5226 r5579 9 9 % macro=InverseAnalysisEnum() 10 10 11 macro= 30;11 macro=29; -
issm/trunk/src/m/enum/IsHutterEnum.m
r5553 r5579 9 9 % macro=IsHutterEnum() 10 10 11 macro=27 6;11 macro=275; -
issm/trunk/src/m/enum/IsMacAyealPattynEnum.m
r5553 r5579 9 9 % macro=IsMacAyealPattynEnum() 10 10 11 macro=27 7;11 macro=276; -
issm/trunk/src/m/enum/IsStokesEnum.m
r5553 r5579 9 9 % macro=IsStokesEnum() 10 10 11 macro=27 8;11 macro=277; -
issm/trunk/src/m/enum/IuToExtEnum.m
r5553 r5579 9 9 % macro=IuToExtEnum() 10 10 11 macro=15 6;11 macro=155; -
issm/trunk/src/m/enum/JEnum.m
r5553 r5579 9 9 % macro=JEnum() 10 10 11 macro=22 9;11 macro=228; -
issm/trunk/src/m/enum/KflagEnum.m
r5553 r5579 9 9 % macro=KflagEnum() 10 10 11 macro=15 5;11 macro=154; -
issm/trunk/src/m/enum/LatentHeatEnum.m
r5553 r5579 9 9 % macro=LatentHeatEnum() 10 10 11 macro=27 9;11 macro=278; -
issm/trunk/src/m/enum/LoadEnum.m
r5226 r5579 9 9 % macro=LoadEnum() 10 10 11 macro=7 7;11 macro=76; -
issm/trunk/src/m/enum/LowmemEnum.m
r5553 r5579 9 9 % macro=LowmemEnum() 10 10 11 macro=2 80;11 macro=279; -
issm/trunk/src/m/enum/MacAyealApproximationEnum.m
r5226 r5579 9 9 % macro=MacAyealApproximationEnum() 10 10 11 macro=6 1;11 macro=60; -
issm/trunk/src/m/enum/MacAyealIceFrontEnum.m
r5555 r5579 9 9 % macro=MacAyealIceFrontEnum() 10 10 11 macro=8 5;11 macro=84; -
issm/trunk/src/m/enum/MacAyealPattynApproximationEnum.m
r5226 r5579 9 9 % macro=MacAyealPattynApproximationEnum() 10 10 11 macro=6 2;11 macro=61; -
issm/trunk/src/m/enum/MassFluxEnum.m
r5553 r5579 9 9 % macro=MassFluxEnum() 10 10 11 macro=15 8;11 macro=157; -
issm/trunk/src/m/enum/MaterialEnum.m
r5553 r5579 9 9 % macro=MaterialEnum() 10 10 11 macro=8 8;11 macro=87; -
issm/trunk/src/m/enum/MaticeEnum.m
r5553 r5579 9 9 % macro=MaticeEnum() 10 10 11 macro=8 9;11 macro=88; -
issm/trunk/src/m/enum/MatparEnum.m
r5553 r5579 9 9 % macro=MatparEnum() 10 10 11 macro= 90;11 macro=89; -
issm/trunk/src/m/enum/MaxAbsVxEnum.m
r5553 r5579 9 9 % macro=MaxAbsVxEnum() 10 10 11 macro=23 9;11 macro=238; -
issm/trunk/src/m/enum/MaxAbsVyEnum.m
r5553 r5579 9 9 % macro=MaxAbsVyEnum() 10 10 11 macro=24 2;11 macro=241; -
issm/trunk/src/m/enum/MaxAbsVzEnum.m
r5553 r5579 9 9 % macro=MaxAbsVzEnum() 10 10 11 macro=24 5;11 macro=244; -
issm/trunk/src/m/enum/MaxIterEnum.m
r5553 r5579 9 9 % macro=MaxIterEnum() 10 10 11 macro=28 1;11 macro=280; -
issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m
r5553 r5579 9 9 % macro=MaxNonlinearIterationsEnum() 10 10 11 macro=28 2;11 macro=281; -
issm/trunk/src/m/enum/MaxPenetrationEnum.m
r5553 r5579 9 9 % macro=MaxPenetrationEnum() 10 10 11 macro=16 5;11 macro=164; -
issm/trunk/src/m/enum/MaxVelEnum.m
r5553 r5579 9 9 % macro=MaxVelEnum() 10 10 11 macro=23 6;11 macro=235; -
issm/trunk/src/m/enum/MaxVxEnum.m
r5553 r5579 9 9 % macro=MaxVxEnum() 10 10 11 macro=23 8;11 macro=237; -
issm/trunk/src/m/enum/MaxVyEnum.m
r5553 r5579 9 9 % macro=MaxVyEnum() 10 10 11 macro=24 1;11 macro=240; -
issm/trunk/src/m/enum/MaxVzEnum.m
r5553 r5579 9 9 % macro=MaxVzEnum() 10 10 11 macro=24 4;11 macro=243; -
issm/trunk/src/m/enum/MeanVelEnum.m
r5553 r5579 9 9 % macro=MeanVelEnum() 10 10 11 macro=16 6;11 macro=165; -
issm/trunk/src/m/enum/MelangeEnum.m
r5553 r5579 9 9 % macro=MelangeEnum() 10 10 11 macro=11 8;11 macro=117; -
issm/trunk/src/m/enum/MeltingAnalysisEnum.m
r5226 r5579 9 9 % macro=MeltingAnalysisEnum() 10 10 11 macro=5 3;11 macro=52; -
issm/trunk/src/m/enum/MeltingOffsetEnum.m
r5553 r5579 9 9 % macro=MeltingOffsetEnum() 10 10 11 macro=16 7;11 macro=166; -
issm/trunk/src/m/enum/MeltingPointEnum.m
r5553 r5579 9 9 % macro=MeltingPointEnum() 10 10 11 macro=28 3;11 macro=282; -
issm/trunk/src/m/enum/MeltingRateEnum.m
r5553 r5579 9 9 % macro=MeltingRateEnum() 10 10 11 macro=16 8;11 macro=167; -
issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m
r5553 r5579 9 9 % macro=MinMechanicalConstraintsEnum() 10 10 11 macro=28 4;11 macro=283; -
issm/trunk/src/m/enum/MinThermalConstraintsEnum.m
r5553 r5579 9 9 % macro=MinThermalConstraintsEnum() 10 10 11 macro=28 5;11 macro=284; -
issm/trunk/src/m/enum/MinVelEnum.m
r5553 r5579 9 9 % macro=MinVelEnum() 10 10 11 macro=23 5;11 macro=234; -
issm/trunk/src/m/enum/MinVxEnum.m
r5553 r5579 9 9 % macro=MinVxEnum() 10 10 11 macro=23 7;11 macro=236; -
issm/trunk/src/m/enum/MinVyEnum.m
r5553 r5579 9 9 % macro=MinVyEnum() 10 10 11 macro=2 40;11 macro=239; -
issm/trunk/src/m/enum/MinVzEnum.m
r5553 r5579 9 9 % macro=MinVzEnum() 10 10 11 macro=24 3;11 macro=242; -
issm/trunk/src/m/enum/MiniEnum.m
r5553 r5579 9 9 % macro=MiniEnum() 10 10 11 macro=21 8;11 macro=217; -
issm/trunk/src/m/enum/MisfitEnum.m
r5553 r5579 9 9 % macro=MisfitEnum() 10 10 11 macro=16 9;11 macro=168; -
issm/trunk/src/m/enum/MixedLayerCapacityEnum.m
r5553 r5579 9 9 % macro=MixedLayerCapacityEnum() 10 10 11 macro=25 3;11 macro=252; -
issm/trunk/src/m/enum/NStepsEnum.m
r5553 r5579 9 9 % macro=NStepsEnum() 10 10 11 macro=28 6;11 macro=285; -
issm/trunk/src/m/enum/NdtEnum.m
r5553 r5579 9 9 % macro=NdtEnum() 10 10 11 macro=28 7;11 macro=286; -
issm/trunk/src/m/enum/NodalEnum.m
r5553 r5579 9 9 % macro=NodalEnum() 10 10 11 macro=30 9;11 macro=308; -
issm/trunk/src/m/enum/NodeEnum.m
r5226 r5579 9 9 % macro=NodeEnum() 10 10 11 macro=7 5;11 macro=74; -
issm/trunk/src/m/enum/NodeOnBedEnum.m
r5553 r5579 9 9 % macro=NodeOnBedEnum() 10 10 11 macro=1 70;11 macro=169; -
issm/trunk/src/m/enum/NodeOnIceSheetEnum.m
r5553 r5579 9 9 % macro=NodeOnIceSheetEnum() 10 10 11 macro=17 1;11 macro=170; -
issm/trunk/src/m/enum/NodeOnIceShelfEnum.m
r5553 r5579 9 9 % macro=NodeOnIceShelfEnum() 10 10 11 macro=17 2;11 macro=171; -
issm/trunk/src/m/enum/NodeOnSurfaceEnum.m
r5553 r5579 9 9 % macro=NodeOnSurfaceEnum() 10 10 11 macro=17 3;11 macro=172; -
issm/trunk/src/m/enum/NodePropertiesEnum.m
r5226 r5579 9 9 % macro=NodePropertiesEnum() 10 10 11 macro=7 2;11 macro=71; -
issm/trunk/src/m/enum/NoneAnalysisEnum.m
r5226 r5579 9 9 % macro=NoneAnalysisEnum() 10 10 11 macro=5 8;11 macro=57; -
issm/trunk/src/m/enum/NoneApproximationEnum.m
r5226 r5579 9 9 % macro=NoneApproximationEnum() 10 10 11 macro=6 3;11 macro=62; -
issm/trunk/src/m/enum/NumOutputEnum.m
r5553 r5579 9 9 % macro=NumOutputEnum() 10 10 11 macro=28 8;11 macro=287; -
issm/trunk/src/m/enum/NumRiftsEnum.m
r5553 r5579 9 9 % macro=NumRiftsEnum() 10 10 11 macro=28 9;11 macro=288; -
issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m
r5553 r5579 9 9 % macro=NumberNodeToElementConnectivityEnum() 10 10 11 macro=17 4;11 macro=173; -
issm/trunk/src/m/enum/NumberOfElementsEnum.m
r5553 r5579 9 9 % macro=NumberOfElementsEnum() 10 10 11 macro=2 90;11 macro=289; -
issm/trunk/src/m/enum/NumberOfNodesEnum.m
r5553 r5579 9 9 % macro=NumberOfNodesEnum() 10 10 11 macro=29 1;11 macro=290; -
issm/trunk/src/m/enum/NumberOfVerticesEnum.m
r5553 r5579 9 9 % macro=NumberOfVerticesEnum() 10 10 11 macro=29 2;11 macro=291; -
issm/trunk/src/m/enum/NumericalfluxEnum.m
r5226 r5579 9 9 % macro=NumericalfluxEnum() 10 10 11 macro=7 9;11 macro=78; -
issm/trunk/src/m/enum/ObjectEnum.m
r5226 r5579 9 9 % macro=ObjectEnum() 10 10 11 macro=6 6;11 macro=65; -
issm/trunk/src/m/enum/OldGradientEnum.m
r5553 r5579 9 9 % macro=OldGradientEnum() 10 10 11 macro=26 5;11 macro=264; -
issm/trunk/src/m/enum/OptScalEnum.m
r5553 r5579 9 9 % macro=OptScalEnum() 10 10 11 macro=29 3;11 macro=292; -
issm/trunk/src/m/enum/OutputFilePointerEnum.m
r5553 r5579 9 9 % macro=OutputFilePointerEnum() 10 10 11 macro=29 4;11 macro=293; -
issm/trunk/src/m/enum/OutputFrequencyEnum.m
r5553 r5579 9 9 % macro=OutputFrequencyEnum() 10 10 11 macro=23 4;11 macro=233; -
issm/trunk/src/m/enum/P0Enum.m
r5553 r5579 9 9 % macro=P0Enum() 10 10 11 macro=21 5;11 macro=214; -
issm/trunk/src/m/enum/P1DGEnum.m
r5553 r5579 9 9 % macro=P1DGEnum() 10 10 11 macro=21 7;11 macro=216; -
issm/trunk/src/m/enum/P1Enum.m
r5553 r5579 9 9 % macro=P1Enum() 10 10 11 macro=21 6;11 macro=215; -
issm/trunk/src/m/enum/ParamEnum.m
r5553 r5579 9 9 % macro=ParamEnum() 10 10 11 macro=9 7;11 macro=96; -
issm/trunk/src/m/enum/ParameterOutputEnum.m
r5553 r5579 9 9 % macro=ParameterOutputEnum() 10 10 11 macro=29 5;11 macro=294; -
issm/trunk/src/m/enum/ParametersAnalysisEnum.m
r5226 r5579 9 9 % macro=ParametersAnalysisEnum() 10 10 11 macro=5 5;11 macro=54; -
issm/trunk/src/m/enum/ParametersSolutionEnum.m
r5226 r5579 9 9 % macro=ParametersSolutionEnum() 10 10 11 macro=5 4;11 macro=53; -
issm/trunk/src/m/enum/PatchEnum.m
r5553 r5579 9 9 % macro=PatchEnum() 10 10 11 macro=2 30;11 macro=229; -
issm/trunk/src/m/enum/PatchNodesEnum.m
r5553 r5579 9 9 % macro=PatchNodesEnum() 10 10 11 macro=23 2;11 macro=231; -
issm/trunk/src/m/enum/PatchVerticesEnum.m
r5553 r5579 9 9 % macro=PatchVerticesEnum() 10 10 11 macro=23 1;11 macro=230; -
issm/trunk/src/m/enum/PattynApproximationEnum.m
r5226 r5579 9 9 % macro=PattynApproximationEnum() 10 10 11 macro=6 4;11 macro=63; -
issm/trunk/src/m/enum/PattynIceFrontEnum.m
r5555 r5579 9 9 % macro=PattynIceFrontEnum() 10 10 11 macro=8 6;11 macro=85; -
issm/trunk/src/m/enum/PenaltyMeltingEnum.m
r5553 r5579 9 9 % macro=PenaltyMeltingEnum() 10 10 11 macro=29 6;11 macro=295; -
issm/trunk/src/m/enum/PenaltyOffsetEnum.m
r5553 r5579 9 9 % macro=PenaltyOffsetEnum() 10 10 11 macro=17 5;11 macro=174; -
issm/trunk/src/m/enum/PengridEnum.m
r5226 r5579 9 9 % macro=PengridEnum() 10 10 11 macro= 80;11 macro=79; -
issm/trunk/src/m/enum/PenpairEnum.m
r5226 r5579 9 9 % macro=PenpairEnum() 10 10 11 macro=8 1;11 macro=80; -
issm/trunk/src/m/enum/PentaEnum.m
r5226 r5579 9 9 % macro=PentaEnum() 10 10 11 macro=7 3;11 macro=72; -
issm/trunk/src/m/enum/PentaVertexElementResultEnum.m
r5553 r5579 9 9 % macro=PentaVertexElementResultEnum() 10 10 11 macro=22 1;11 macro=220; -
issm/trunk/src/m/enum/PentaVertexInputEnum.m
r5553 r5579 9 9 % macro=PentaVertexInputEnum() 10 10 11 macro=9 5;11 macro=94; -
issm/trunk/src/m/enum/PetscMatParamEnum.m
r5553 r5579 9 9 % macro=PetscMatParamEnum() 10 10 11 macro=10 5;11 macro=104; -
issm/trunk/src/m/enum/PetscVecExternalResultEnum.m
r5553 r5579 9 9 % macro=PetscVecExternalResultEnum() 10 10 11 macro=22 7;11 macro=226; -
issm/trunk/src/m/enum/PetscVecParamEnum.m
r5553 r5579 9 9 % macro=PetscVecParamEnum() 10 10 11 macro=10 6;11 macro=105; -
issm/trunk/src/m/enum/PflagEnum.m
r5553 r5579 9 9 % macro=PflagEnum() 10 10 11 macro=17 6;11 macro=175; -
issm/trunk/src/m/enum/PressureEnum.m
r5553 r5579 9 9 % macro=PressureEnum() 10 10 11 macro=17 7;11 macro=176; -
issm/trunk/src/m/enum/PressureOldEnum.m
r5553 r5579 9 9 % macro=PressureOldEnum() 10 10 11 macro=17 8;11 macro=177; -
issm/trunk/src/m/enum/PrognosticAnalysisEnum.m
r5226 r5579 9 9 % macro=PrognosticAnalysisEnum() 10 10 11 macro=5 2;11 macro=51; -
issm/trunk/src/m/enum/PrognosticSolutionEnum.m
r5226 r5579 9 9 % macro=PrognosticSolutionEnum() 10 10 11 macro=5 1;11 macro=50; -
issm/trunk/src/m/enum/QmuAnalysisEnum.m
r5553 r5579 9 9 % macro=QmuAnalysisEnum() 10 10 11 macro=29 7;11 macro=296; -
issm/trunk/src/m/enum/QmuErrNameEnum.m
r5553 r5579 9 9 % macro=QmuErrNameEnum() 10 10 11 macro=29 8;11 macro=297; -
issm/trunk/src/m/enum/QmuInNameEnum.m
r5553 r5579 9 9 % macro=QmuInNameEnum() 10 10 11 macro=29 9;11 macro=298; -
issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m
r5553 r5579 9 9 % macro=QmuMassFluxSegmentsEnum() 10 10 11 macro= 300;11 macro=299; -
issm/trunk/src/m/enum/QmuNPartEnum.m
r5553 r5579 9 9 % macro=QmuNPartEnum() 10 10 11 macro=30 1;11 macro=300; -
issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m
r5553 r5579 9 9 % macro=QmuNumberOfResponsesEnum() 10 10 11 macro=30 4;11 macro=303; -
issm/trunk/src/m/enum/QmuOutNameEnum.m
r5553 r5579 9 9 % macro=QmuOutNameEnum() 10 10 11 macro=30 2;11 macro=301; -
issm/trunk/src/m/enum/QmuPartEnum.m
r5553 r5579 9 9 % macro=QmuPartEnum() 10 10 11 macro=30 3;11 macro=302; -
issm/trunk/src/m/enum/QmuPressureEnum.m
r5553 r5579 9 9 % macro=QmuPressureEnum() 10 10 11 macro=17 9;11 macro=178; -
issm/trunk/src/m/enum/QmuVxEnum.m
r5553 r5579 9 9 % macro=QmuVxEnum() 10 10 11 macro=20 3;11 macro=202; -
issm/trunk/src/m/enum/QmuVyEnum.m
r5553 r5579 9 9 % macro=QmuVyEnum() 10 10 11 macro=20 8;11 macro=207; -
issm/trunk/src/m/enum/QmuVzEnum.m
r5553 r5579 9 9 % macro=QmuVzEnum() 10 10 11 macro=21 3;11 macro=212; -
issm/trunk/src/m/enum/QuadRiftFrontEnum.m
r5553 r5579 9 9 % macro=QuadRiftFrontEnum() 10 10 11 macro=8 2;11 macro=81; -
issm/trunk/src/m/enum/RegularEnum.m
r5553 r5579 9 9 % macro=RegularEnum() 10 10 11 macro=30 6;11 macro=305; -
issm/trunk/src/m/enum/RelativeEnum.m
r5553 r5579 9 9 % macro=RelativeEnum() 10 10 11 macro=24 6;11 macro=245; -
issm/trunk/src/m/enum/ResetPenaltiesEnum.m
r5553 r5579 9 9 % macro=ResetPenaltiesEnum() 10 10 11 macro=1 80;11 macro=179; -
issm/trunk/src/m/enum/ResidualEnum.m
r5553 r5579 9 9 % macro=ResidualEnum() 10 10 11 macro=24 7;11 macro=246; -
issm/trunk/src/m/enum/ResponseDescriptorsEnum.m
r5553 r5579 9 9 % macro=ResponseDescriptorsEnum() 10 10 11 macro=3 10;11 macro=309; -
issm/trunk/src/m/enum/RheologyBEnum.m
r5553 r5579 9 9 % macro=RheologyBEnum() 10 10 11 macro=18 1;11 macro=180; -
issm/trunk/src/m/enum/RheologyBbarEnum.m
r5553 r5579 9 9 % macro=RheologyBbarEnum() 10 10 11 macro=18 2;11 macro=181; -
issm/trunk/src/m/enum/RheologyNEnum.m
r5553 r5579 9 9 % macro=RheologyNEnum() 10 10 11 macro=18 3;11 macro=182; -
issm/trunk/src/m/enum/RhoIceEnum.m
r5553 r5579 9 9 % macro=RhoIceEnum() 10 10 11 macro=24 9;11 macro=248; -
issm/trunk/src/m/enum/RhoWaterEnum.m
r5553 r5579 9 9 % macro=RhoWaterEnum() 10 10 11 macro=2 50;11 macro=249; -
issm/trunk/src/m/enum/RiftfrontEnum.m
r5553 r5579 9 9 % macro=RiftfrontEnum() 10 10 11 macro=8 3;11 macro=82; -
issm/trunk/src/m/enum/ScaledEnum.m
r5553 r5579 9 9 % macro=ScaledEnum() 10 10 11 macro=30 8;11 macro=307; -
issm/trunk/src/m/enum/SegmentEnum.m
r5226 r5579 9 9 % macro=SegmentEnum() 10 10 11 macro=6 8;11 macro=67; -
issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m
r5553 r5579 9 9 % macro=SegmentOnIceShelfEnum() 10 10 11 macro=18 4;11 macro=183; -
issm/trunk/src/m/enum/SegmentRiftfrontEnum.m
r5553 r5579 9 9 % macro=SegmentRiftfrontEnum() 10 10 11 macro=8 4;11 macro=83; -
issm/trunk/src/m/enum/SeparateEnum.m
r5553 r5579 9 9 % macro=SeparateEnum() 10 10 11 macro=25 7;11 macro=256; -
issm/trunk/src/m/enum/SolverStringEnum.m
r5553 r5579 9 9 % macro=SolverStringEnum() 10 10 11 macro=31 1;11 macro=310; -
issm/trunk/src/m/enum/SparsityEnum.m
r5553 r5579 9 9 % macro=SparsityEnum() 10 10 11 macro=31 2;11 macro=311; -
issm/trunk/src/m/enum/SpcEnum.m
r5553 r5579 9 9 % macro=SpcEnum() 10 10 11 macro=11 1;11 macro=110; -
issm/trunk/src/m/enum/StabilizeConstraintsEnum.m
r5553 r5579 9 9 % macro=StabilizeConstraintsEnum() 10 10 11 macro=18 5;11 macro=184; -
issm/trunk/src/m/enum/SteadyAnalysisEnum.m
r5226 r5579 9 9 % macro=SteadyAnalysisEnum() 10 10 11 macro=3 7;11 macro=36; -
issm/trunk/src/m/enum/SteadystateAnalysisEnum.m
r5226 r5579 9 9 % macro=SteadystateAnalysisEnum() 10 10 11 macro=5 7;11 macro=56; -
issm/trunk/src/m/enum/SteadystateSolutionEnum.m
r5226 r5579 9 9 % macro=SteadystateSolutionEnum() 10 10 11 macro=5 6;11 macro=55; -
issm/trunk/src/m/enum/StokesAnalysisEnum.m
r4359 r5579 9 9 % macro=StokesAnalysisEnum() 10 10 11 macro=2 2;11 macro=21; -
issm/trunk/src/m/enum/StokesApproximationEnum.m
r5226 r5579 9 9 % macro=StokesApproximationEnum() 10 10 11 macro=6 5;11 macro=64; -
issm/trunk/src/m/enum/StokesIceFrontEnum.m
r5555 r5579 9 9 % macro=StokesIceFrontEnum() 10 10 11 macro=8 7;11 macro=86; -
issm/trunk/src/m/enum/StokesReconditioningEnum.m
r5553 r5579 9 9 % macro=StokesReconditioningEnum() 10 10 11 macro=18 6;11 macro=185; -
issm/trunk/src/m/enum/StringArrayParamEnum.m
r5553 r5579 9 9 % macro=StringArrayParamEnum() 10 10 11 macro=10 7;11 macro=106; -
issm/trunk/src/m/enum/StringExternalResultEnum.m
r5553 r5579 9 9 % macro=StringExternalResultEnum() 10 10 11 macro=22 8;11 macro=227; -
issm/trunk/src/m/enum/StringParamEnum.m
r5553 r5579 9 9 % macro=StringParamEnum() 10 10 11 macro=10 8;11 macro=107; -
issm/trunk/src/m/enum/StringToEnum.m
r5553 r5579 28 28 elseif (strcmpi(name,'DiagnosticVertAnalysis')), enum=DiagnosticVertAnalysisEnum(); return 29 29 elseif (strcmpi(name,'DiagnosticHutterAnalysis')), enum=DiagnosticHutterAnalysisEnum(); return 30 elseif (strcmpi(name,'DiagnosticStokesAnalysis')), enum=DiagnosticStokesAnalysisEnum(); return31 30 elseif (strcmpi(name,'HorizAnalysis')), enum=HorizAnalysisEnum(); return 32 31 elseif (strcmpi(name,'HutterAnalysis')), enum=HutterAnalysisEnum(); return -
issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m
r5553 r5579 9 9 % macro=SurfaceAbsVelMisfitEnum() 10 10 11 macro=1 60;11 macro=159; -
issm/trunk/src/m/enum/SurfaceAreaEnum.m
r5553 r5579 9 9 % macro=SurfaceAreaEnum() 10 10 11 macro=18 7;11 macro=186; -
issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m
r5553 r5579 9 9 % macro=SurfaceAverageVelMisfitEnum() 10 10 11 macro=16 4;11 macro=163; -
issm/trunk/src/m/enum/SurfaceEnum.m
r5553 r5579 9 9 % macro=SurfaceEnum() 10 10 11 macro=18 8;11 macro=187; -
issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m
r5553 r5579 9 9 % macro=SurfaceLogVelMisfitEnum() 10 10 11 macro=16 2;11 macro=161; -
issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m
r5553 r5579 9 9 % macro=SurfaceLogVxVyMisfitEnum() 10 10 11 macro=16 3;11 macro=162; -
issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m
r5553 r5579 9 9 % macro=SurfaceRelVelMisfitEnum() 10 10 11 macro=16 1;11 macro=160; -
issm/trunk/src/m/enum/SurfaceSlopeAnalysisEnum.m
r5226 r5579 9 9 % macro=SurfaceSlopeAnalysisEnum() 10 10 11 macro=4 2;11 macro=41; -
issm/trunk/src/m/enum/SurfaceSlopeSolutionEnum.m
r5226 r5579 9 9 % macro=SurfaceSlopeSolutionEnum() 10 10 11 macro=4 1;11 macro=40; -
issm/trunk/src/m/enum/SurfaceSlopeXAnalysisEnum.m
r5226 r5579 9 9 % macro=SurfaceSlopeXAnalysisEnum() 10 10 11 macro=4 5;11 macro=44; -
issm/trunk/src/m/enum/SurfaceSlopeXEnum.m
r5553 r5579 9 9 % macro=SurfaceSlopeXEnum() 10 10 11 macro=18 9;11 macro=188; -
issm/trunk/src/m/enum/SurfaceSlopeYAnalysisEnum.m
r5226 r5579 9 9 % macro=SurfaceSlopeYAnalysisEnum() 10 10 11 macro=4 6;11 macro=45; -
issm/trunk/src/m/enum/SurfaceSlopeYEnum.m
r5553 r5579 9 9 % macro=SurfaceSlopeYEnum() 10 10 11 macro=1 90;11 macro=189; -
issm/trunk/src/m/enum/TemperatureEnum.m
r5553 r5579 9 9 % macro=TemperatureEnum() 10 10 11 macro=19 1;11 macro=190; -
issm/trunk/src/m/enum/TemperatureOldEnum.m
r5553 r5579 9 9 % macro=TemperatureOldEnum() 10 10 11 macro=19 2;11 macro=191; -
issm/trunk/src/m/enum/ThermalAnalysisEnum.m
r5226 r5579 9 9 % macro=ThermalAnalysisEnum() 10 10 11 macro=3 2;11 macro=31; -
issm/trunk/src/m/enum/ThermalConductivityEnum.m
r5553 r5579 9 9 % macro=ThermalConductivityEnum() 10 10 11 macro=25 2;11 macro=251; -
issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m
r5553 r5579 9 9 % macro=ThermalExchangeVelocityEnum() 10 10 11 macro=25 4;11 macro=253; -
issm/trunk/src/m/enum/ThermalSolutionEnum.m
r5226 r5579 9 9 % macro=ThermalSolutionEnum() 10 10 11 macro=3 1;11 macro=30; -
issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m
r5553 r5579 9 9 % macro=ThicknessAbsMisfitEnum() 10 10 11 macro=15 9;11 macro=158; -
issm/trunk/src/m/enum/ThicknessEnum.m
r5553 r5579 9 9 % macro=ThicknessEnum() 10 10 11 macro=19 3;11 macro=192; -
issm/trunk/src/m/enum/ThicknessObsEnum.m
r5553 r5579 9 9 % macro=ThicknessObsEnum() 10 10 11 macro=19 4;11 macro=193; -
issm/trunk/src/m/enum/TimeEnum.m
r5553 r5579 9 9 % macro=TimeEnum() 10 10 11 macro=23 3;11 macro=232; -
issm/trunk/src/m/enum/TolXEnum.m
r5553 r5579 9 9 % macro=TolXEnum() 10 10 11 macro=31 3;11 macro=312; -
issm/trunk/src/m/enum/Transient2DAnalysisEnum.m
r5226 r5579 9 9 % macro=Transient2DAnalysisEnum() 10 10 11 macro=3 4;11 macro=33; -
issm/trunk/src/m/enum/Transient2DSolutionEnum.m
r5226 r5579 9 9 % macro=Transient2DSolutionEnum() 10 10 11 macro=3 3;11 macro=32; -
issm/trunk/src/m/enum/Transient3DAnalysisEnum.m
r5226 r5579 9 9 % macro=Transient3DAnalysisEnum() 10 10 11 macro=3 6;11 macro=35; -
issm/trunk/src/m/enum/Transient3DSolutionEnum.m
r5226 r5579 9 9 % macro=Transient3DSolutionEnum() 10 10 11 macro=3 5;11 macro=34; -
issm/trunk/src/m/enum/TransientAnalysisEnum.m
r5226 r5579 9 9 % macro=TransientAnalysisEnum() 10 10 11 macro=3 8;11 macro=37; -
issm/trunk/src/m/enum/TriaEnum.m
r5226 r5579 9 9 % macro=TriaEnum() 10 10 11 macro=7 4;11 macro=73; -
issm/trunk/src/m/enum/TriaVertexElementResultEnum.m
r5553 r5579 9 9 % macro=TriaVertexElementResultEnum() 10 10 11 macro=2 20;11 macro=219; -
issm/trunk/src/m/enum/TriaVertexInputEnum.m
r5553 r5579 9 9 % macro=TriaVertexInputEnum() 10 10 11 macro=9 6;11 macro=95; -
issm/trunk/src/m/enum/TypeEnum.m
r5553 r5579 9 9 % macro=TypeEnum() 10 10 11 macro=19 5;11 macro=194; -
issm/trunk/src/m/enum/VariableDescriptorsEnum.m
r5553 r5579 9 9 % macro=VariableDescriptorsEnum() 10 10 11 macro=31 4;11 macro=313; -
issm/trunk/src/m/enum/VelEnum.m
r5553 r5579 9 9 % macro=VelEnum() 10 10 11 macro=19 6;11 macro=195; -
issm/trunk/src/m/enum/VelObsEnum.m
r5553 r5579 9 9 % macro=VelObsEnum() 10 10 11 macro=19 7;11 macro=196; -
issm/trunk/src/m/enum/VerboseEnum.m
r5553 r5579 9 9 % macro=VerboseEnum() 10 10 11 macro=31 5;11 macro=314; -
issm/trunk/src/m/enum/VertAnalysisEnum.m
r4359 r5579 9 9 % macro=VertAnalysisEnum() 10 10 11 macro=2 3;11 macro=22; -
issm/trunk/src/m/enum/VertexEnum.m
r5226 r5579 9 9 % macro=VertexEnum() 10 10 11 macro=7 6;11 macro=75; -
issm/trunk/src/m/enum/ViscosityOvershootEnum.m
r5553 r5579 9 9 % macro=ViscosityOvershootEnum() 10 10 11 macro=19 8;11 macro=197; -
issm/trunk/src/m/enum/VxAverageEnum.m
r5553 r5579 9 9 % macro=VxAverageEnum() 10 10 11 macro=19 9;11 macro=198; -
issm/trunk/src/m/enum/VxEnum.m
r5553 r5579 9 9 % macro=VxEnum() 10 10 11 macro= 200;11 macro=199; -
issm/trunk/src/m/enum/VxObsEnum.m
r5553 r5579 9 9 % macro=VxObsEnum() 10 10 11 macro=20 1;11 macro=200; -
issm/trunk/src/m/enum/VxOldEnum.m
r5553 r5579 9 9 % macro=VxOldEnum() 10 10 11 macro=20 2;11 macro=201; -
issm/trunk/src/m/enum/VyAverageEnum.m
r5553 r5579 9 9 % macro=VyAverageEnum() 10 10 11 macro=20 4;11 macro=203; -
issm/trunk/src/m/enum/VyEnum.m
r5553 r5579 9 9 % macro=VyEnum() 10 10 11 macro=20 5;11 macro=204; -
issm/trunk/src/m/enum/VyObsEnum.m
r5553 r5579 9 9 % macro=VyObsEnum() 10 10 11 macro=20 6;11 macro=205; -
issm/trunk/src/m/enum/VyOldEnum.m
r5553 r5579 9 9 % macro=VyOldEnum() 10 10 11 macro=20 7;11 macro=206; -
issm/trunk/src/m/enum/VzAverageEnum.m
r5553 r5579 9 9 % macro=VzAverageEnum() 10 10 11 macro=20 9;11 macro=208; -
issm/trunk/src/m/enum/VzEnum.m
r5553 r5579 9 9 % macro=VzEnum() 10 10 11 macro=2 10;11 macro=209; -
issm/trunk/src/m/enum/VzObsEnum.m
r5553 r5579 9 9 % macro=VzObsEnum() 10 10 11 macro=21 1;11 macro=210; -
issm/trunk/src/m/enum/VzOldEnum.m
r5553 r5579 9 9 % macro=VzOldEnum() 10 10 11 macro=21 2;11 macro=211; -
issm/trunk/src/m/enum/WaitOnLockEnum.m
r5553 r5579 9 9 % macro=WaitOnLockEnum() 10 10 11 macro=31 6;11 macro=315; -
issm/trunk/src/m/enum/WaterEnum.m
r5553 r5579 9 9 % macro=WaterEnum() 10 10 11 macro=11 5;11 macro=114; -
issm/trunk/src/m/enum/WeightsEnum.m
r5553 r5579 9 9 % macro=WeightsEnum() 10 10 11 macro=21 4;11 macro=213; -
issm/trunk/src/m/enum/YtsEnum.m
r5553 r5579 9 9 % macro=YtsEnum() 10 10 11 macro=31 7;11 macro=316; -
issm/trunk/src/m/solutions/SolutionConfiguration.m
r5433 r5579 11 11 12 12 case DiagnosticSolutionEnum, 13 numanalyses=6; 14 %analyses=[DiagnosticHorizAnalysisEnum]; 15 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticStokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum]; 13 numanalyses=5; 14 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum]; 16 15 17 16 case SteadystateSolutionEnum, 18 numanalyses= 8;19 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;Diagnostic StokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];17 numanalyses=7; 18 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum]; 20 19 21 20 case ThermalSolutionEnum, … … 44 43 45 44 case Transient2DSolutionEnum, 46 numanalyses= 7;47 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;Diagnostic StokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum];45 numanalyses=6; 46 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum]; 48 47 49 48 case Transient3DSolutionEnum, 50 numanalyses= 9;51 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;Diagnostic StokesAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];49 numanalyses=8; 50 analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;PrognosticAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum]; 52 51 53 52 otherwise -
issm/trunk/src/m/solutions/adjointdiagnostic_core.m
r5412 r5579 15 15 %set analysis type to compute velocity: 16 16 displaystring('\n%s',[' computing velocities']); 17 if(isstokes), femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum); 18 else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); end 17 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); 19 18 femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads); 20 19 … … 24 23 %compute adjoint 25 24 displaystring('\n%s',[' computing adjoint']); 26 if(isstokes), femmodel=SetCurrentConfiguration(femmodel,Diagnostic StokesAnalysisEnum,AdjointStokesAnalysisEnum);25 if(isstokes), femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum,AdjointStokesAnalysisEnum); 27 26 else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum,AdjointHorizAnalysisEnum); end 28 27 femmodel=solver_adjoint_linear(femmodel); -
issm/trunk/src/m/solutions/diagnostic_core.m
r5436 r5579 65 65 66 66 displaystring(verbose,'\n%s',['computing stokes velocities and pressure...']); 67 femmodel=SetCurrentConfiguration(femmodel,Diagnostic StokesAnalysisEnum);67 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); 68 68 femmodel=solver_diagnostic_nonlinear(femmodel,conserve_loads); 69 69 end -
issm/trunk/src/m/solutions/objectivefunctionC.m
r5282 r5579 13 13 %set current configuration 14 14 if (solution_type==DiagnosticSolutionEnum | solution_type==SteadystateSolutionEnum) 15 if isstokes, femmodel=SetCurrentConfiguration(femmodel,DiagnosticStokesAnalysisEnum); 16 else femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); end 15 femmodel=SetCurrentConfiguration(femmodel,DiagnosticHorizAnalysisEnum); 17 16 elseif (solution_type==BalancedthicknessSolutionEnum) 18 17 femmodel=SetCurrentConfiguration(femmodel,BalancedthicknessAnalysisEnum);
Note:
See TracChangeset
for help on using the changeset viewer.