Changeset 5631
- Timestamp:
- 08/31/10 09:44:22 (15 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 210 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h
r5596 r5631 172 172 CmResponseEnum, 173 173 CmResponsesEnum, 174 CmMaxDmpSlopeEnum,175 CmMaxDmpValueEnum,176 CmMinDmpSlopeEnum,177 CmMinDmpValueEnum,178 174 CmNoiseDmpEnum, 179 175 ConstantEnum, -
issm/trunk/src/c/EnumDefinitions/EnumToString.cpp
r5596 r5631 146 146 case CmResponseEnum : return "CmResponse"; 147 147 case CmResponsesEnum : return "CmResponses"; 148 case CmMaxDmpSlopeEnum : return "CmMaxDmpSlope";149 case CmMaxDmpValueEnum : return "CmMaxDmpValue";150 case CmMinDmpSlopeEnum : return "CmMinDmpSlope";151 case CmMinDmpValueEnum : return "CmMinDmpValue";152 148 case CmNoiseDmpEnum : return "CmNoiseDmp"; 153 149 case ConstantEnum : return "Constant"; -
issm/trunk/src/c/EnumDefinitions/StringToEnum.cpp
r5596 r5631 144 144 else if (strcmp(name,"CmResponse")==0) return CmResponseEnum; 145 145 else if (strcmp(name,"CmResponses")==0) return CmResponsesEnum; 146 else if (strcmp(name,"CmMaxDmpSlope")==0) return CmMaxDmpSlopeEnum;147 else if (strcmp(name,"CmMaxDmpValue")==0) return CmMaxDmpValueEnum;148 else if (strcmp(name,"CmMinDmpSlope")==0) return CmMinDmpSlopeEnum;149 else if (strcmp(name,"CmMinDmpValue")==0) return CmMinDmpValueEnum;150 146 else if (strcmp(name,"CmNoiseDmp")==0) return CmNoiseDmpEnum; 151 147 else if (strcmp(name,"Constant")==0) return ConstantEnum; -
issm/trunk/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp
r5358 r5631 45 45 parameters->AddObject(new DoubleParam(MeanVelEnum,iomodel->meanvel)); 46 46 parameters->AddObject(new DoubleParam(CmNoiseDmpEnum,iomodel->cm_noisedmp)); 47 parameters->AddObject(new DoubleParam(CmMinDmpValueEnum,iomodel->cm_mindmp_value));48 parameters->AddObject(new DoubleParam(CmMinDmpSlopeEnum,iomodel->cm_mindmp_slope));49 parameters->AddObject(new DoubleParam(CmMaxDmpValueEnum,iomodel->cm_maxdmp_value));50 parameters->AddObject(new DoubleParam(CmMaxDmpSlopeEnum,iomodel->cm_maxdmp_slope));51 47 parameters->AddObject(new DoubleParam(CmMinEnum,iomodel->cm_min)); 52 48 parameters->AddObject(new DoubleParam(CmMaxEnum,iomodel->cm_max)); -
issm/trunk/src/c/objects/Elements/Tria.cpp
r5630 r5631 916 916 void Tria::GetSolutionFromInputs(Vec solution){ 917 917 918 /*retrive parameters: */ 918 919 int analysis_type; 919 920 /*retrive parameters: */921 920 parameters->FindParam(&analysis_type,AnalysisTypeEnum); 922 921 … … 934 933 /*}}}*/ 935 934 /*FUNCTION Tria::GetThicknessList {{{1*/ 936 void Tria::GetThicknessList(double* thickness_list){ 937 938 const int numvertices=3; 939 double gaussgrids[numvertices][numvertices]={{1,0,0},{0,1,0},{0,0,1}}; 940 inputs->GetParameterValues(thickness_list,&gaussgrids[0][0],3,ThicknessEnum); 935 void Tria::GetThicknessList(double* thicknesslist){ 936 937 Input *thickness_input = NULL; 938 GaussTria *gauss = NULL; 939 940 /*Recover input*/ 941 thickness_input=inputs->GetInput(ThicknessEnum); 942 943 /*Checks in debugging mode*/ 944 ISSMASSERT(thicknesslist); 945 ISSMASSERT(thickness_input); 946 947 /* Start looping on the number of vertices: */ 948 gauss=new GaussTria(); 949 for (int iv=0;iv<3;iv++){ 950 gauss->GaussVertex(iv); 951 thickness_input->GetParameterValue(&thicknesslist[iv],gauss); 952 } 953 954 /*clean-up*/ 955 delete gauss; 941 956 942 957 } … … 945 960 void Tria::GetVectorFromInputs(Vec vector,int NameEnum){ 946 961 947 int i;948 962 const int numvertices=3; 949 963 int doflist1[numvertices]; 950 964 951 965 /*Find NameEnum input in the inputs dataset, and get it to fill in the vector: */ 952 for(i =0;i<this->inputs->Size();i++){966 for(int i=0;i<this->inputs->Size();i++){ 953 967 Input* input=(Input*)this->inputs->GetObjectByOffset(i); 954 968 if(input->EnumType()==NameEnum){ … … 964 978 void Tria::Gradj(Vec gradient,int control_type){ 965 979 966 /* inputs:*/980 /*retrieve inputs :*/ 967 981 bool onwater; 968 969 /*retrieve inputs :*/970 982 inputs->GetParameterValue(&onwater,ElementOnWaterEnum); 971 983 … … 973 985 if(onwater)return; 974 986 975 if (control_type==DragCoefficientEnum){ 976 GradjDrag(gradient); 977 } 978 else if (control_type==RheologyBbarEnum){ 979 GradjB(gradient); 980 } 981 else if (control_type==DhDtEnum){ 982 GradjDhDt(gradient); 983 } 984 else ISSMERROR("%s%i","control type not supported yet: ",control_type); 987 switch(control_type){ 988 case DragCoefficientEnum: 989 GradjDrag(gradient); 990 break; 991 case RheologyBbarEnum: 992 GradjB(gradient); 993 break; 994 case DhDtEnum: 995 GradjDhDt(gradient); 996 break; 997 default: 998 ISSMERROR("%s%i","control type not supported yet: ",control_type); 999 } 985 1000 } 986 1001 /*}}}*/ … … 988 1003 void Tria::GradjB(Vec gradient){ 989 1004 990 int i; 991 992 /* node data: */ 1005 /* constants*/ 993 1006 const int numvertices=3; 994 const int NDOF1=1;995 1007 const int NDOF2=2; 996 const int numdof=NDOF2*numvertices; 997 double xyz_list[numvertices][3]; 998 int doflist1[numvertices]; 999 double dh1dh3[NDOF2][numvertices]; 1000 1001 /* grid data: */ 1002 double B[numvertices]; 1003 1004 1005 /* gaussian points: */ 1006 int num_gauss,ig; 1007 double* first_gauss_area_coord = NULL; 1008 double* second_gauss_area_coord = NULL; 1009 double* third_gauss_area_coord = NULL; 1010 double* gauss_weights = NULL; 1011 double gauss_weight; 1012 double gauss_l1l2l3[3]; 1013 1014 /*element vector at the gaussian points: */ 1015 double grade_g[numvertices]={0.0}; 1016 double grade_g_gaussian[numvertices]; 1017 1018 /* Jacobian: */ 1019 double Jdet; 1020 1021 /*nodal functions: */ 1022 double l1l2l3[3]; 1023 1024 /* strain rate: */ 1025 double epsilon[3]; /* epsilon=[exx,eyy,exy];*/ 1026 1027 /* parameters: */ 1028 double viscosity_complement; 1029 double dvx[NDOF2]; 1030 double dvy[NDOF2]; 1031 double dadjx[NDOF2]; 1032 double dadjy[NDOF2]; 1033 double vx,vy; 1034 double lambda,mu; 1035 double thickness; 1036 double dB[NDOF2]; 1037 double B_gauss; 1038 1039 /*parameters: */ 1040 double cm_noisedmp; 1041 double cm_mindmp_slope; 1042 double cm_mindmp_value; 1043 double cm_maxdmp_value; 1044 double cm_maxdmp_slope; 1045 1046 /*inputs: */ 1047 Input* thickness_input=NULL; 1048 Input* vx_input=NULL; 1049 Input* vy_input=NULL; 1050 Input* adjointx_input=NULL; 1051 Input* adjointy_input=NULL; 1052 Input* rheologyb_input=NULL; 1008 1009 /*Intermediaries*/ 1010 int i,ig; 1011 double Jdet; 1012 double viscosity_complement; 1013 double vx,vy,lambda,mu,thickness; 1014 double cm_noisedmp; 1015 int doflist[numvertices]; 1016 double dvx[NDOF2],dvy[NDOF2],dadjx[NDOF2],dadjy[NDOF2],dB[NDOF2]; 1017 double xyz_list[numvertices][3]; 1018 double basis[3]; 1019 double dbasis[NDOF2][numvertices]; 1020 double grad[numvertices]={0.0}; 1021 double grad_g[numvertices]; 1022 double epsilon[3]; /* epsilon=[exx,eyy,exy];*/ 1023 GaussTria *gauss = NULL; 1053 1024 1054 1025 /*retrieve some parameters: */ 1055 1026 this->parameters->FindParam(&cm_noisedmp,CmNoiseDmpEnum); 1056 this->parameters->FindParam(&cm_mindmp_value,CmMinDmpValueEnum);1057 this->parameters->FindParam(&cm_mindmp_slope,CmMinDmpSlopeEnum);1058 this->parameters->FindParam(&cm_maxdmp_value,CmMaxDmpValueEnum);1059 this->parameters->FindParam(&cm_maxdmp_slope,CmMaxDmpSlopeEnum);1060 1027 1061 1028 /* Get node coordinates and dof list: */ 1062 1029 GetVerticesCoordinates(&xyz_list[0][0], nodes, numvertices); 1063 GetDofList1(&doflist1[0]); 1064 1065 /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */ 1066 GaussLegendreTria( &num_gauss, &first_gauss_area_coord, &second_gauss_area_coord, &third_gauss_area_coord, &gauss_weights, 4); 1067 1068 /*Retrieve all inputs we will be needing: */ 1069 thickness_input=inputs->GetInput(ThicknessEnum); 1070 vx_input=inputs->GetInput(VxEnum); 1071 vy_input=inputs->GetInput(VyEnum); 1072 adjointx_input=inputs->GetInput(AdjointxEnum); 1073 adjointy_input=inputs->GetInput(AdjointyEnum); 1074 rheologyb_input=matice->inputs->GetInput(RheologyBbarEnum); 1030 GetDofList1(&doflist[0]); 1031 1032 /*Retrieve all inputs*/ 1033 Input* thickness_input=inputs->GetInput(ThicknessEnum); ISSMASSERT(thickness_input); 1034 Input* vx_input=inputs->GetInput(VxEnum); ISSMASSERT(vx_input); 1035 Input* vy_input=inputs->GetInput(VyEnum); ISSMASSERT(vy_input); 1036 Input* adjointx_input=inputs->GetInput(AdjointxEnum); ISSMASSERT(adjointx_input); 1037 Input* adjointy_input=inputs->GetInput(AdjointyEnum); ISSMASSERT(adjointy_input); 1038 Input* rheologyb_input=matice->inputs->GetInput(RheologyBbarEnum); ISSMASSERT(rheologyb_input); 1075 1039 1076 1040 /* Start looping on the number of gaussian points: */ 1077 for (ig=0; ig<num_gauss; ig++){ 1078 /*Pick up the gaussian point: */ 1079 gauss_weight=*(gauss_weights+ig); 1080 gauss_l1l2l3[0]=*(first_gauss_area_coord+ig); 1081 gauss_l1l2l3[1]=*(second_gauss_area_coord+ig); 1082 gauss_l1l2l3[2]=*(third_gauss_area_coord+ig); 1083 1084 /*Get thickness: */ 1085 thickness_input->GetParameterValue(&thickness, gauss_l1l2l3); 1086 1087 /*Get strain rate, if velocity has been supplied: */ 1088 this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss_l1l2l3,vx_input,vy_input); 1089 1090 /*Get viscosity complement: */ 1091 matice->GetViscosityComplement(&viscosity_complement, &epsilon[0]); 1092 1093 /*Get dvx, dvy, dadjx and dadjx: */ 1094 vx_input->GetParameterDerivativeValue(&dvx[0],&xyz_list[0][0],&gauss_l1l2l3[0]); 1095 vy_input->GetParameterDerivativeValue(&dvy[0],&xyz_list[0][0],&gauss_l1l2l3[0]); 1096 adjointx_input->GetParameterDerivativeValue(&dadjx[0],&xyz_list[0][0],&gauss_l1l2l3[0]); 1097 adjointy_input->GetParameterDerivativeValue(&dadjy[0],&xyz_list[0][0],&gauss_l1l2l3[0]); 1098 1099 /* Get Jacobian determinant: */ 1100 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss_l1l2l3); 1101 1102 /* Get nodal functions value at gaussian point:*/ 1103 GetNodalFunctions(l1l2l3, gauss_l1l2l3); 1104 1105 /*Get nodal functions derivatives*/ 1106 GetNodalFunctionsDerivatives(&dh1dh3[0][0],&xyz_list[0][0],gauss_l1l2l3); 1107 1108 /*Get B derivative: dB/dx */ 1109 rheologyb_input->GetParameterDerivativeValue(&dB[0],&xyz_list[0][0],&gauss_l1l2l3[0]); 1110 rheologyb_input->GetParameterValue(&B_gauss, gauss_l1l2l3); 1111 1112 /*Build gradje_g_gaussian vector (actually -dJ/dB): */ 1041 gauss=new GaussTria(4); 1042 for (ig=gauss->begin();ig<gauss->end();ig++){ 1043 1044 gauss->GaussPoint(ig); 1045 1046 thickness_input->GetParameterValue(&thickness,gauss); 1047 rheologyb_input->GetParameterDerivativeValue(&dB[0],&xyz_list[0][0],gauss); 1048 vx_input->GetParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); 1049 vy_input->GetParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); 1050 adjointx_input->GetParameterDerivativeValue(&dadjx[0],&xyz_list[0][0],gauss); 1051 adjointy_input->GetParameterDerivativeValue(&dadjy[0],&xyz_list[0][0],gauss); 1052 1053 this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); 1054 matice->GetViscosityComplement(&viscosity_complement,&epsilon[0]); 1055 1056 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss); 1057 GetNodalFunctions(basis,gauss); 1058 GetNodalFunctionsDerivatives(&dbasis[0][0],&xyz_list[0][0],gauss); 1059 1060 /*standard gradient dJ/dki*/ 1113 1061 for (i=0;i<numvertices;i++){ 1114 //standard gradient dJ/dki 1115 grade_g_gaussian[i]=-viscosity_complement*thickness*( (2*dvx[0]+dvy[1])*2*dadjx[0]+(dvx[1]+dvy[0])*(dadjx[1]+dadjy[0])+(2*dvy[1]+dvx[0])*2*dadjy[1])*Jdet*gauss_weight*l1l2l3[i]; 1116 1117 //Add regularization term 1118 grade_g_gaussian[i]-=cm_noisedmp*Jdet*gauss_weight*(dh1dh3[0][i]*dB[0]+dh1dh3[1][i]*dB[1]); 1119 1120 //min dampening 1121 if(B_gauss<cm_mindmp_value){ 1122 grade_g_gaussian[i]+= cm_mindmp_slope*Jdet*gauss_weight*l1l2l3[i]; 1123 } 1124 1125 //max dampening 1126 if(B_gauss>cm_maxdmp_value){ 1127 grade_g_gaussian[i]+= - cm_maxdmp_slope*Jdet*gauss_weight*l1l2l3[i]; 1128 } 1129 1062 grad_g[i]=-viscosity_complement*thickness*( (2*dvx[0]+dvy[1])*2*dadjx[0]+(dvx[1]+dvy[0])*(dadjx[1]+dadjy[0])+(2*dvy[1]+dvx[0])*2*dadjy[1])*Jdet*gauss->weight*basis[i]; 1130 1063 } 1131 1132 /*Add grade_g_gaussian to grade_g: */ 1133 for( i=0; i<numvertices;i++) grade_g[i]+=grade_g_gaussian[i]; 1064 /*Add regularization term*/ 1065 for (i=0;i<numvertices;i++){ 1066 grad_g[i]-=cm_noisedmp*Jdet*gauss->weight*(dbasis[0][i]*dB[0]+dbasis[1][i]*dB[1]); 1067 } 1068 1069 for(i=0;i<numvertices;i++) grad[i]+=grad_g[i]; 1134 1070 } 1135 1071 1136 1072 /*Add grade_g to global vector gradient: */ 1137 VecSetValues(gradient,numvertices,doflist1,(const double*)grade_g,ADD_VALUES); 1138 1139 xfree((void**)&first_gauss_area_coord); 1140 xfree((void**)&second_gauss_area_coord); 1141 xfree((void**)&third_gauss_area_coord); 1142 xfree((void**)&gauss_weights); 1073 VecSetValues(gradient,numvertices,doflist,(const double*)grad,ADD_VALUES); 1074 1075 /*clean-up*/ 1076 delete gauss; 1143 1077 } 1144 1078 /*}}}*/ … … 1151 1085 const int numvertices=3; 1152 1086 const int NDOF2=2; 1153 const int numdof=NDOF2*numvertices;1154 1087 double xyz_list[numvertices][3]; 1155 1088 int doflist1[numvertices]; … … 1200 1133 /*parameters: */ 1201 1134 double cm_noisedmp; 1202 double cm_mindmp_slope;1203 double cm_mindmp_value;1204 double cm_maxdmp_value;1205 double cm_maxdmp_slope;1206 1135 1207 1136 int analysis_type; … … 1215 1144 /*retrieve some parameters: */ 1216 1145 this->parameters->FindParam(&cm_noisedmp,CmNoiseDmpEnum); 1217 this->parameters->FindParam(&cm_mindmp_value,CmMinDmpValueEnum);1218 this->parameters->FindParam(&cm_mindmp_slope,CmMinDmpSlopeEnum);1219 this->parameters->FindParam(&cm_maxdmp_value,CmMaxDmpValueEnum);1220 this->parameters->FindParam(&cm_maxdmp_slope,CmMaxDmpSlopeEnum);1221 1146 1222 1147 /*Get out if shelf*/ … … 1290 1215 //noise dampening d/dki(1/2*(dk/dx)^2) 1291 1216 grade_g_gaussian[i]+=-cm_noisedmp*Jdet*gauss_weight*(dh1dh3[0][i]*dk[0]+dh1dh3[1][i]*dk[1]); 1292 1293 //min dampening1294 if(drag<cm_mindmp_value){1295 grade_g_gaussian[i]+=cm_mindmp_slope*Jdet*gauss_weight*l1l2l3[i];1296 }1297 1298 //max dampening1299 if(drag>cm_maxdmp_value){1300 grade_g_gaussian[i]+= - cm_maxdmp_slope*Jdet*gauss_weight*l1l2l3[i];1301 }1302 1217 } 1303 1218 … … 1324 1239 /* node data: */ 1325 1240 const int numvertices=3; 1326 const int NDOF1=1;1327 1241 int doflist1[numvertices]; 1328 1242 … … 6686 6600 } 6687 6601 /*}}}*/ 6688 /*FUNCTION Tria::GetStrainRate2d {{{1*/6602 /*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input){{{1*/ 6689 6603 void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input){ 6604 /*Compute the 2d Strain Rate (3 components): 6605 * 6606 * epsilon=[exx eyy exy] 6607 */ 6608 6609 int i; 6610 6611 double epsilonvx[3]; 6612 double epsilonvy[3]; 6613 6614 /*Check that both inputs have been found*/ 6615 if (!vx_input || !vy_input){ 6616 ISSMERROR("Input missing. Here are the input pointers we have for vx: %p, vy: %p\n",vx_input,vy_input); 6617 } 6618 6619 /*Get strain rate assuming that epsilon has been allocated*/ 6620 vx_input->GetVxStrainRate2d(epsilonvx,xyz_list,gauss); 6621 vy_input->GetVyStrainRate2d(epsilonvy,xyz_list,gauss); 6622 6623 /*Sum all contributions*/ 6624 for(i=0;i<3;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i]; 6625 6626 } 6627 /*}}}*/ 6628 /*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{1*/ 6629 void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){ 6690 6630 /*Compute the 2d Strain Rate (3 components): 6691 6631 * … … 6766 6706 /*parameters: */ 6767 6707 double cm_noisedmp; 6768 double cm_mindmp_slope;6769 double cm_mindmp_value;6770 double cm_maxdmp_value;6771 double cm_maxdmp_slope;6772 6708 6773 6709 int analysis_type; … … 6782 6718 /*retrieve some parameters: */ 6783 6719 this->parameters->FindParam(&cm_noisedmp,CmNoiseDmpEnum); 6784 this->parameters->FindParam(&cm_mindmp_value,CmMinDmpValueEnum);6785 this->parameters->FindParam(&cm_mindmp_slope,CmMinDmpSlopeEnum);6786 this->parameters->FindParam(&cm_maxdmp_value,CmMaxDmpValueEnum);6787 this->parameters->FindParam(&cm_maxdmp_slope,CmMaxDmpSlopeEnum);6788 6720 6789 6721 /*Get out if shelf*/ … … 6854 6786 //Add regularization term 6855 6787 grade_g_gaussian[i]+= - cm_noisedmp*Jdet*gauss_weight*(dh1dh3[0][i]*dk[0]+dh1dh3[1][i]*dk[1]); 6856 6857 //min dampening6858 if(drag<cm_mindmp_value){6859 grade_g_gaussian[i]+= cm_mindmp_slope*Jdet*gauss_weight*l1l2l3[i];6860 }6861 6862 //max dampening6863 if(drag>cm_maxdmp_value){6864 grade_g_gaussian[i]+= - cm_maxdmp_slope*Jdet*gauss_weight*l1l2l3[i];6865 }6866 6788 } 6867 6789 -
issm/trunk/src/c/objects/Elements/Tria.h
r5578 r5631 162 162 void GetSolutionFromInputsDiagnosticHutter(Vec solution); 163 163 void GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input); 164 void GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input); 164 165 void GradjDragStokes(Vec gradient); 165 166 void InputUpdateFromSolutionAdjointBalancedthickness( double* solution); -
issm/trunk/src/c/objects/Elements/TriaRef.cpp
r5629 r5631 54 54 /*FUNCTION TriaRef::GetBMacAyeal {{{1*/ 55 55 void TriaRef::GetBMacAyeal(double* B, double* xyz_list, double* gauss){ 56 /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. 57 * For grid i, Bi can be expressed in the actual coordinate system 58 * by: 59 * Bi=[ dh/dx 0 ] 60 * [ 0 dh/dy ] 61 * [ 1/2*dh/dy 1/2*dh/dx ] 62 * where h is the interpolation function for grid i. 63 * 64 * We assume B has been allocated already, of size: 3x(NDOF2*numgrids) 65 */ 66 67 int i; 68 const int NDOF2=2; 69 const int numgrids=3; 70 71 double dh1dh3[NDOF2][numgrids]; 72 73 74 /*Get dh1dh2dh3 in actual coordinate system: */ 75 GetNodalFunctionsDerivatives(&dh1dh3[0][0],xyz_list,gauss); 76 77 /*Build B: */ 78 for (i=0;i<numgrids;i++){ 79 *(B+NDOF2*numgrids*0+NDOF2*i)=dh1dh3[0][i]; //B[0][NDOF2*i]=dh1dh3[0][i]; 80 *(B+NDOF2*numgrids*0+NDOF2*i+1)=0; 81 *(B+NDOF2*numgrids*1+NDOF2*i)=0; 82 *(B+NDOF2*numgrids*1+NDOF2*i+1)=dh1dh3[1][i]; 83 *(B+NDOF2*numgrids*2+NDOF2*i)=(float).5*dh1dh3[1][i]; 84 *(B+NDOF2*numgrids*2+NDOF2*i+1)=(float).5*dh1dh3[0][i]; 85 } 86 } 87 /*}}}*/ 88 /*FUNCTION TriaRef::GetBMacAyeal {{{1*/ 89 void TriaRef::GetBMacAyeal(double* B, double* xyz_list, GaussTria* gauss){ 56 90 /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. 57 91 * For grid i, Bi can be expressed in the actual coordinate system -
issm/trunk/src/c/objects/Elements/TriaRef.h
r5629 r5631 26 26 /*Numerics*/ 27 27 void GetBMacAyeal(double* B, double* xyz_list, double* gauss); 28 void GetBMacAyeal(double* B, double* xyz_list, GaussTria* gauss); 28 29 void GetBprimeMacAyeal(double* Bprime, double* xyz_list, double* gauss); 29 30 void GetBprimePrognostic(double* Bprime_prog, double* xyz_list, double* gauss); -
issm/trunk/src/c/objects/Inputs/BoolInput.h
r5629 r5631 60 60 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 61 61 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 64 void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 65 void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 66 void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 67 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 68 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 62 69 void ChangeEnum(int newenumtype); 63 70 void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); -
issm/trunk/src/c/objects/Inputs/DoubleInput.h
r5629 r5631 59 59 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 60 60 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 61 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 62 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 63 void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 64 void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 65 void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 66 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 67 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 61 68 void ChangeEnum(int newenumtype); 62 69 void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); -
issm/trunk/src/c/objects/Inputs/Input.h
r5629 r5631 38 38 virtual void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss)=0; 39 39 virtual void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss)=0; 40 virtual void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss)=0; 41 virtual void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss)=0; 42 virtual void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss)=0; 43 virtual void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss)=0; 44 virtual void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss)=0; 45 virtual void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss)=0; 46 virtual void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss)=0; 40 47 virtual void ChangeEnum(int newenumtype)=0; 41 48 -
issm/trunk/src/c/objects/Inputs/IntInput.h
r5629 r5631 60 60 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 61 61 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 64 void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 65 void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 66 void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 67 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 68 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 62 69 void ChangeEnum(int newenumtype); 63 70 void SquareMin(double* psquaremin, bool process_units,Parameters* parameters); -
issm/trunk/src/c/objects/Inputs/PentaVertexInput.h
r5629 r5631 60 60 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss); 61 61 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss); 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 64 void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 65 void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 66 void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 67 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 68 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 62 69 void ChangeEnum(int newenumtype); 63 70 -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.cpp
r5629 r5631 261 261 } 262 262 /*}}}*/ 263 /*FUNCTION TriaVertexInput::GetVxStrainRate2d{{{1*/ 264 void TriaVertexInput::GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ 265 266 /*Intermediary*/ 267 int i; 268 const int numgrids=3; 269 const int NDOF2=2; 270 double B[3][NDOF2*numgrids]; 271 double velocity[3][NDOF2]; 272 273 /*Get B matrix: */ 274 GetBMacAyeal(&B[0][0], xyz_list, gauss); 275 276 /*Here, we are computing the strain rate of (vx,0)*/ 277 for(i=0;i<3;i++){ 278 velocity[i][0]=this->values[i]; 279 velocity[i][1]=0.0; 280 } 281 /*Get epsilon(vx) = B*velocity*/ 282 MatrixMultiply( &B[0][0],3,NDOF2*numgrids,0, 283 &velocity[0][0],NDOF2*numgrids,1,0, 284 epsilonvx,0); 285 } 286 /*}}}*/ 287 /*FUNCTION TriaVertexInput::GetVyStrainRate2d{{{1*/ 288 void TriaVertexInput::GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ 289 290 /*Intermediary*/ 291 int i; 292 const int numgrids=3; 293 const int NDOF2=2; 294 double B[3][NDOF2*numgrids]; 295 double velocity[3][NDOF2]; 296 297 /*Get B matrix: */ 298 GetBMacAyeal(&B[0][0], xyz_list, gauss); 299 300 /*Here, we are computing the strain rate of (0,vy)*/ 301 for(i=0;i<3;i++){ 302 velocity[i][0]=0.0; 303 velocity[i][1]=this->values[i]; 304 } 305 /*Get epsilon(vy) = B*velocity*/ 306 MatrixMultiply( &B[0][0],3,NDOF2*numgrids,0, 307 &velocity[0][0],NDOF2*numgrids,1,0, 308 epsilonvy,0); 309 } 310 /*}}}*/ 263 311 /*FUNCTION TriaVertexInput::ChangeEnum{{{1*/ 264 312 void TriaVertexInput::ChangeEnum(int newenumtype){ -
issm/trunk/src/c/objects/Inputs/TriaVertexInput.h
r5629 r5631 60 60 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 61 61 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, double* gauss){ISSMERROR("not implemented yet");}; 62 void GetVxStrainRate2d(double* epsilonvx,double* xyz_list, GaussTria* gauss); 63 void GetVyStrainRate2d(double* epsilonvy,double* xyz_list, GaussTria* gauss); 64 void GetVxStrainRate3d(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 65 void GetVyStrainRate3d(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 66 void GetVzStrainRate3d(double* epsilonvz,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 67 void GetVxStrainRate3dPattyn(double* epsilonvx,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 68 void GetVyStrainRate3dPattyn(double* epsilonvy,double* xyz_list, GaussTria* gauss){ISSMERROR("not implemented yet");}; 62 69 void ChangeEnum(int newenumtype); 63 70 -
issm/trunk/src/c/objects/IoModel.cpp
r5524 r5631 167 167 IoModelFetchData(&this->tolx,iomodel_handle,"tolx"); 168 168 IoModelFetchData(&this->cm_noisedmp,iomodel_handle,"cm_noisedmp"); 169 IoModelFetchData(&this->cm_mindmp_value,iomodel_handle,"cm_mindmp_value");170 IoModelFetchData(&this->cm_mindmp_slope,iomodel_handle,"cm_mindmp_slope");171 IoModelFetchData(&this->cm_maxdmp_value,iomodel_handle,"cm_maxdmp_value");172 IoModelFetchData(&this->cm_maxdmp_slope,iomodel_handle,"cm_maxdmp_slope");173 169 IoModelFetchData(&this->cm_min,iomodel_handle,"cm_min"); 174 170 IoModelFetchData(&this->cm_max,iomodel_handle,"cm_max"); … … 310 306 this->maxiter=NULL; 311 307 this->cm_noisedmp=0; 312 this->cm_mindmp_value=0;313 this->cm_mindmp_slope=0;314 this->cm_maxdmp_value=0;315 this->cm_maxdmp_slope=0;316 308 this->cm_min=0; 317 309 this->cm_max=0; -
issm/trunk/src/c/objects/IoModel.h
r5524 r5631 115 115 double stokesreconditioning; 116 116 double cm_noisedmp; 117 double cm_mindmp_value;118 double cm_mindmp_slope;119 double cm_maxdmp_value;120 double cm_maxdmp_slope;121 117 double cm_min; 122 118 double cm_max; -
issm/trunk/src/m/classes/@model/model.m
r5546 r5631 204 204 md.eps_cm=0; 205 205 md.cm_noisedmp=0; 206 md.cm_mindmp_value=0;207 md.cm_mindmp_slope=0;208 md.cm_maxdmp_value=0;209 md.cm_maxdmp_slope=0;210 206 md.cm_min=0; 211 207 md.cm_max=0; -
issm/trunk/src/m/classes/@model/setdefaultparameters.m
r5370 r5631 191 191 md.cm_jump=.7*ones(md.nsteps,1); %30 per cent decrement. 192 192 193 %cm_mindampening stabilize the inversed parameter above194 %a given scalar with a given penalty. Not applied by default195 md.cm_mindmp_value=0;196 md.cm_mindmp_slope=0;197 198 %cm_maxdampening stabilize the inversed parameter below199 %a given scalar with a given penalty. Not applied by default200 md.cm_maxdmp_value=150;201 md.cm_maxdmp_value=0;202 203 193 %cm_min is the minimum acceptable value of the 204 194 %inversed parameter (B>0 for example) -
issm/trunk/src/m/classes/public/display/displaycontrol.m
r5359 r5631 21 21 fielddisplay(md,'cm_jump','decrease threshold for misfit, default is 30%'); 22 22 fielddisplay(md,'cm_noisedmp','noise dampening coefficient, 0 if not applied'); 23 fielddisplay(md,'cm_mindmp_value','minimum acceptable value of the inversed parameter before being dampened');24 fielddisplay(md,'cm_mindmp_slope','dampening coefficient applied to parameter below minimum, 0 if not applied');25 fielddisplay(md,'cm_maxdmp_value','maximum acceptable value of the inversed parameter before being dampened');26 fielddisplay(md,'cm_maxdmp_slope','dampening coefficient applied to parameter above maximum, 0 if not applied');27 23 fielddisplay(md,'cm_min','absolute minimum acceptable value of the inversed parameter'); 28 24 fielddisplay(md,'cm_max','absolute maximum acceptable value of the inversed parameter'); -
issm/trunk/src/m/classes/public/marshall.m
r5524 r5631 118 118 WriteData(fid,md.maxiter,'Mat','maxiter'); 119 119 WriteData(fid,md.cm_noisedmp,'Scalar','cm_noisedmp'); 120 WriteData(fid,md.cm_mindmp_value,'Scalar','cm_mindmp_value');121 WriteData(fid,md.cm_mindmp_slope,'Scalar','cm_mindmp_slope');122 WriteData(fid,md.cm_maxdmp_value,'Scalar','cm_maxdmp_value');123 WriteData(fid,md.cm_maxdmp_slope,'Scalar','cm_maxdmp_slope');124 120 WriteData(fid,md.cm_min,'Scalar','cm_min'); 125 121 WriteData(fid,md.cm_max,'Scalar','cm_max'); -
issm/trunk/src/m/classes/public/parametercontroloptimization.m
r5359 r5631 30 30 md2.eps_cm=NaN; 31 31 md2.cm_noisedmp=0; 32 md2.cm_maxdmp_slope=0;33 md2.cm_mindmp_slope=0;34 32 md2.nsteps=getfieldvalue(options,'nsteps',5); 35 33 md2.control_type=getfieldvalue(options,'md2.control_type',DragCoefficientEnum); -
issm/trunk/src/m/classes/public/parameterization/parametercontrolB.m
r5383 r5631 13 13 % md=parametercontrolB(md,'nsteps',20,'cm_noisedmp',10^-15,'cm_responses',0) 14 14 % md=parametercontrolB(md,'cm_min',10,'cm_max',10^8,'cm_jump',0.99,'maxiter',20) 15 % md=parametercontrolB(md,'cm_maxdmp_value',5*10^8,'cm_maxdmp_slope',10^-20,,'cm_mindmp_value',10^7,'cm_mindmp_slope',10^-17)16 15 % md=parametercontrolB(md,eps_cm',10^-4,'optscal',[10^7 10^8]) 17 16 % … … 78 77 end 79 78 80 %cm_mindmp81 cm_mindmp_value=getfieldvalue(options,'cm_mindmp_value',5*10^7); %=paterson(273.15)82 if (length(cm_mindmp_value)~=1)83 md.cm_mindmp_value=5*10^7;84 else85 md.cm_mindmp_value=cm_mindmp_value;86 end87 cm_mindmp_slope=getfieldvalue(options,'cm_mindmp_slope',10^-18);88 if (length(cm_mindmp_slope)~=1)89 md.cm_mindmp_slope=10^-18;90 else91 md.cm_mindmp_slope=cm_mindmp_slope;92 end93 94 79 %eps_cm 95 80 eps_cm=getfieldvalue(options,'eps_cm',NaN); -
issm/trunk/src/m/classes/public/parameterization/parametercontroldrag.m
r5383 r5631 13 13 % md=parametercontroldrag(md,'nsteps',20,'cm_noisedmp',10^-8,'cm_responses',0) 14 14 % md=parametercontroldrag(md,'cm_min',1,'cm_max',150,'cm_jump',0.99,'maxiter',20) 15 % md=parametercontroldrag(md,'cm_maxdmp_value',100,'cm_maxdmp_slope',10^-13,,'cm_mindmp_value',10,'cm_mindmp_slope',10^-17)16 15 % md=parametercontroldrag(md,eps_cm',10^-4,'optscal',[10^7 10^8]) 17 16 % … … 78 77 end 79 78 80 %cm_mindmp81 cm_mindmp_value=getfieldvalue(options,'cm_mindmp_value',1);82 if (length(cm_mindmp_value)~=1)83 md.cm_mindmp_value=1;84 else85 md.cm_mindmp_value=cm_mindmp_value;86 end87 cm_mindmp_slope=getfieldvalue(options,'cm_mindmp_slope',0);88 if (length(cm_mindmp_slope)~=1)89 md.cm_mindmp_slope=0;90 else91 md.cm_mindmp_slope=cm_mindmp_slope;92 end93 94 79 %eps_cm 95 80 eps_cm=getfieldvalue(options,'eps_cm',NaN); -
issm/trunk/src/m/enum/AbsoluteEnum.m
r5597 r5631 9 9 % macro=AbsoluteEnum() 10 10 11 macro=24 7;11 macro=243; -
issm/trunk/src/m/enum/AdjointEnum.m
r5597 r5631 9 9 % macro=AdjointEnum() 10 10 11 macro=2 62;11 macro=258; -
issm/trunk/src/m/enum/BetaEnum.m
r5597 r5631 9 9 % macro=BetaEnum() 10 10 11 macro=25 7;11 macro=253; -
issm/trunk/src/m/enum/BoolExternalResultEnum.m
r5597 r5631 9 9 % macro=BoolExternalResultEnum() 10 10 11 macro=2 21;11 macro=217; -
issm/trunk/src/m/enum/CmGradientEnum.m
r5597 r5631 9 9 % macro=CmGradientEnum() 10 10 11 macro=25 8;11 macro=254; -
issm/trunk/src/m/enum/CmJumpEnum.m
r5597 r5631 9 9 % macro=CmJumpEnum() 10 10 11 macro=25 9;11 macro=255; -
issm/trunk/src/m/enum/CmMaxEnum.m
r5597 r5631 9 9 % macro=CmMaxEnum() 10 10 11 macro=2 60;11 macro=256; -
issm/trunk/src/m/enum/CmMinEnum.m
r5597 r5631 9 9 % macro=CmMinEnum() 10 10 11 macro=2 61;11 macro=257; -
issm/trunk/src/m/enum/CmNoiseDmpEnum.m
r5597 r5631 9 9 % macro=CmNoiseDmpEnum() 10 10 11 macro=13 4;11 macro=130; -
issm/trunk/src/m/enum/ColinearEnum.m
r5597 r5631 9 9 % macro=ColinearEnum() 10 10 11 macro=25 5;11 macro=251; -
issm/trunk/src/m/enum/ConnectivityEnum.m
r5597 r5631 9 9 % macro=ConnectivityEnum() 10 10 11 macro=26 5;11 macro=261; -
issm/trunk/src/m/enum/ConstantEnum.m
r5597 r5631 9 9 % macro=ConstantEnum() 10 10 11 macro=13 5;11 macro=131; -
issm/trunk/src/m/enum/ControlParameterEnum.m
r5597 r5631 9 9 % macro=ControlParameterEnum() 10 10 11 macro=26 6;11 macro=262; -
issm/trunk/src/m/enum/ControlSteadyEnum.m
r5597 r5631 9 9 % macro=ControlSteadyEnum() 10 10 11 macro=26 7;11 macro=263; -
issm/trunk/src/m/enum/ControlTypeEnum.m
r5597 r5631 9 9 % macro=ControlTypeEnum() 10 10 11 macro=13 6;11 macro=132; -
issm/trunk/src/m/enum/ConvergedEnum.m
r5597 r5631 9 9 % macro=ConvergedEnum() 10 10 11 macro=13 7;11 macro=133; -
issm/trunk/src/m/enum/DakotaParameterEnum.m
r5597 r5631 9 9 % macro=DakotaParameterEnum() 10 10 11 macro=26 8;11 macro=264; -
issm/trunk/src/m/enum/DhDtEnum.m
r5597 r5631 9 9 % macro=DhDtEnum() 10 10 11 macro=13 8;11 macro=134; -
issm/trunk/src/m/enum/DimEnum.m
r5597 r5631 9 9 % macro=DimEnum() 10 10 11 macro=26 9;11 macro=265; -
issm/trunk/src/m/enum/DoubleElementResultEnum.m
r5597 r5631 9 9 % macro=DoubleElementResultEnum() 10 10 11 macro=21 8;11 macro=214; -
issm/trunk/src/m/enum/DoubleExternalResultEnum.m
r5597 r5631 9 9 % macro=DoubleExternalResultEnum() 10 10 11 macro=2 22;11 macro=218; -
issm/trunk/src/m/enum/DoubleMatExternalResultEnum.m
r5597 r5631 9 9 % macro=DoubleMatExternalResultEnum() 10 10 11 macro=22 4;11 macro=220; -
issm/trunk/src/m/enum/DoubleVecExternalResultEnum.m
r5597 r5631 9 9 % macro=DoubleVecExternalResultEnum() 10 10 11 macro=2 23;11 macro=219; -
issm/trunk/src/m/enum/DragCoefficientEnum.m
r5597 r5631 9 9 % macro=DragCoefficientEnum() 10 10 11 macro=13 9;11 macro=135; -
issm/trunk/src/m/enum/DragPEnum.m
r5597 r5631 9 9 % macro=DragPEnum() 10 10 11 macro=1 40;11 macro=136; -
issm/trunk/src/m/enum/DragQEnum.m
r5597 r5631 9 9 % macro=DragQEnum() 10 10 11 macro=1 41;11 macro=137; -
issm/trunk/src/m/enum/DragTypeEnum.m
r5597 r5631 9 9 % macro=DragTypeEnum() 10 10 11 macro=1 42;11 macro=138; -
issm/trunk/src/m/enum/DtEnum.m
r5597 r5631 9 9 % macro=DtEnum() 10 10 11 macro=1 43;11 macro=139; -
issm/trunk/src/m/enum/ElementOnBedEnum.m
r5597 r5631 9 9 % macro=ElementOnBedEnum() 10 10 11 macro=14 4;11 macro=140; -
issm/trunk/src/m/enum/ElementOnIceShelfEnum.m
r5597 r5631 9 9 % macro=ElementOnIceShelfEnum() 10 10 11 macro=14 5;11 macro=141; -
issm/trunk/src/m/enum/ElementOnSurfaceEnum.m
r5597 r5631 9 9 % macro=ElementOnSurfaceEnum() 10 10 11 macro=14 6;11 macro=142; -
issm/trunk/src/m/enum/ElementOnWaterEnum.m
r5597 r5631 9 9 % macro=ElementOnWaterEnum() 10 10 11 macro=14 7;11 macro=143; -
issm/trunk/src/m/enum/EnumToString.m
r5597 r5631 141 141 case CmResponseEnum(), string='CmResponse'; return 142 142 case CmResponsesEnum(), string='CmResponses'; return 143 case CmMaxDmpSlopeEnum(), string='CmMaxDmpSlope'; return144 case CmMaxDmpValueEnum(), string='CmMaxDmpValue'; return145 case CmMinDmpSlopeEnum(), string='CmMinDmpSlope'; return146 case CmMinDmpValueEnum(), string='CmMinDmpValue'; return147 143 case CmNoiseDmpEnum(), string='CmNoiseDmp'; return 148 144 case ConstantEnum(), string='Constant'; return -
issm/trunk/src/m/enum/EpsAbsEnum.m
r5597 r5631 9 9 % macro=EpsAbsEnum() 10 10 11 macro=2 70;11 macro=266; -
issm/trunk/src/m/enum/EpsCmEnum.m
r5597 r5631 9 9 % macro=EpsCmEnum() 10 10 11 macro=2 71;11 macro=267; -
issm/trunk/src/m/enum/EpsRelEnum.m
r5597 r5631 9 9 % macro=EpsRelEnum() 10 10 11 macro=2 72;11 macro=268; -
issm/trunk/src/m/enum/EpsResEnum.m
r5597 r5631 9 9 % macro=EpsResEnum() 10 10 11 macro=2 73;11 macro=269; -
issm/trunk/src/m/enum/EpsVelEnum.m
r5597 r5631 9 9 % macro=EpsVelEnum() 10 10 11 macro=14 8;11 macro=144; -
issm/trunk/src/m/enum/ExtToIuEnum.m
r5597 r5631 9 9 % macro=ExtToIuEnum() 10 10 11 macro=15 6;11 macro=152; -
issm/trunk/src/m/enum/FillEnum.m
r5597 r5631 9 9 % macro=FillEnum() 10 10 11 macro=14 9;11 macro=145; -
issm/trunk/src/m/enum/FractionIncrementEnum.m
r5597 r5631 9 9 % macro=FractionIncrementEnum() 10 10 11 macro=1 50;11 macro=146; -
issm/trunk/src/m/enum/FrictionEnum.m
r5597 r5631 9 9 % macro=FrictionEnum() 10 10 11 macro=1 51;11 macro=147; -
issm/trunk/src/m/enum/GeothermalFluxEnum.m
r5597 r5631 9 9 % macro=GeothermalFluxEnum() 10 10 11 macro=1 52;11 macro=148; -
issm/trunk/src/m/enum/GradientEnum.m
r5597 r5631 9 9 % macro=GradientEnum() 10 10 11 macro=2 63;11 macro=259; -
issm/trunk/src/m/enum/GravityEnum.m
r5597 r5631 9 9 % macro=GravityEnum() 10 10 11 macro=2 50;11 macro=246; -
issm/trunk/src/m/enum/HeatCapacityEnum.m
r5597 r5631 9 9 % macro=HeatCapacityEnum() 10 10 11 macro=27 4;11 macro=270; -
issm/trunk/src/m/enum/IndexEnum.m
r5597 r5631 9 9 % macro=IndexEnum() 10 10 11 macro=30 6;11 macro=302; -
issm/trunk/src/m/enum/IndexedEnum.m
r5597 r5631 9 9 % macro=IndexedEnum() 10 10 11 macro=30 4;11 macro=300; -
issm/trunk/src/m/enum/IntExternalResultEnum.m
r5597 r5631 9 9 % macro=IntExternalResultEnum() 10 10 11 macro=22 5;11 macro=221; -
issm/trunk/src/m/enum/InternalEnum.m
r5597 r5631 9 9 % macro=InternalEnum() 10 10 11 macro=1 53;11 macro=149; -
issm/trunk/src/m/enum/IntersectEnum.m
r5597 r5631 9 9 % macro=IntersectEnum() 10 10 11 macro=25 4;11 macro=250; -
issm/trunk/src/m/enum/IsHutterEnum.m
r5597 r5631 9 9 % macro=IsHutterEnum() 10 10 11 macro=27 5;11 macro=271; -
issm/trunk/src/m/enum/IsMacAyealPattynEnum.m
r5597 r5631 9 9 % macro=IsMacAyealPattynEnum() 10 10 11 macro=27 6;11 macro=272; -
issm/trunk/src/m/enum/IsStokesEnum.m
r5597 r5631 9 9 % macro=IsStokesEnum() 10 10 11 macro=27 7;11 macro=273; -
issm/trunk/src/m/enum/IuToExtEnum.m
r5597 r5631 9 9 % macro=IuToExtEnum() 10 10 11 macro=15 5;11 macro=151; -
issm/trunk/src/m/enum/JEnum.m
r5597 r5631 9 9 % macro=JEnum() 10 10 11 macro=22 8;11 macro=224; -
issm/trunk/src/m/enum/KflagEnum.m
r5597 r5631 9 9 % macro=KflagEnum() 10 10 11 macro=15 4;11 macro=150; -
issm/trunk/src/m/enum/LatentHeatEnum.m
r5597 r5631 9 9 % macro=LatentHeatEnum() 10 10 11 macro=27 8;11 macro=274; -
issm/trunk/src/m/enum/LowmemEnum.m
r5597 r5631 9 9 % macro=LowmemEnum() 10 10 11 macro=27 9;11 macro=275; -
issm/trunk/src/m/enum/MassFluxEnum.m
r5597 r5631 9 9 % macro=MassFluxEnum() 10 10 11 macro=15 7;11 macro=153; -
issm/trunk/src/m/enum/MaxAbsVxEnum.m
r5597 r5631 9 9 % macro=MaxAbsVxEnum() 10 10 11 macro=23 8;11 macro=234; -
issm/trunk/src/m/enum/MaxAbsVyEnum.m
r5597 r5631 9 9 % macro=MaxAbsVyEnum() 10 10 11 macro=2 41;11 macro=237; -
issm/trunk/src/m/enum/MaxAbsVzEnum.m
r5597 r5631 9 9 % macro=MaxAbsVzEnum() 10 10 11 macro=24 4;11 macro=240; -
issm/trunk/src/m/enum/MaxIterEnum.m
r5597 r5631 9 9 % macro=MaxIterEnum() 10 10 11 macro=2 80;11 macro=276; -
issm/trunk/src/m/enum/MaxNonlinearIterationsEnum.m
r5597 r5631 9 9 % macro=MaxNonlinearIterationsEnum() 10 10 11 macro=2 81;11 macro=277; -
issm/trunk/src/m/enum/MaxPenetrationEnum.m
r5597 r5631 9 9 % macro=MaxPenetrationEnum() 10 10 11 macro=16 4;11 macro=160; -
issm/trunk/src/m/enum/MaxVelEnum.m
r5597 r5631 9 9 % macro=MaxVelEnum() 10 10 11 macro=23 5;11 macro=231; -
issm/trunk/src/m/enum/MaxVxEnum.m
r5597 r5631 9 9 % macro=MaxVxEnum() 10 10 11 macro=23 7;11 macro=233; -
issm/trunk/src/m/enum/MaxVyEnum.m
r5597 r5631 9 9 % macro=MaxVyEnum() 10 10 11 macro=2 40;11 macro=236; -
issm/trunk/src/m/enum/MaxVzEnum.m
r5597 r5631 9 9 % macro=MaxVzEnum() 10 10 11 macro=2 43;11 macro=239; -
issm/trunk/src/m/enum/MeanVelEnum.m
r5597 r5631 9 9 % macro=MeanVelEnum() 10 10 11 macro=16 5;11 macro=161; -
issm/trunk/src/m/enum/MeltingOffsetEnum.m
r5597 r5631 9 9 % macro=MeltingOffsetEnum() 10 10 11 macro=16 6;11 macro=162; -
issm/trunk/src/m/enum/MeltingPointEnum.m
r5597 r5631 9 9 % macro=MeltingPointEnum() 10 10 11 macro=2 82;11 macro=278; -
issm/trunk/src/m/enum/MeltingRateEnum.m
r5597 r5631 9 9 % macro=MeltingRateEnum() 10 10 11 macro=16 7;11 macro=163; -
issm/trunk/src/m/enum/MinMechanicalConstraintsEnum.m
r5597 r5631 9 9 % macro=MinMechanicalConstraintsEnum() 10 10 11 macro=2 83;11 macro=279; -
issm/trunk/src/m/enum/MinThermalConstraintsEnum.m
r5597 r5631 9 9 % macro=MinThermalConstraintsEnum() 10 10 11 macro=28 4;11 macro=280; -
issm/trunk/src/m/enum/MinVelEnum.m
r5597 r5631 9 9 % macro=MinVelEnum() 10 10 11 macro=23 4;11 macro=230; -
issm/trunk/src/m/enum/MinVxEnum.m
r5597 r5631 9 9 % macro=MinVxEnum() 10 10 11 macro=23 6;11 macro=232; -
issm/trunk/src/m/enum/MinVyEnum.m
r5597 r5631 9 9 % macro=MinVyEnum() 10 10 11 macro=23 9;11 macro=235; -
issm/trunk/src/m/enum/MinVzEnum.m
r5597 r5631 9 9 % macro=MinVzEnum() 10 10 11 macro=2 42;11 macro=238; -
issm/trunk/src/m/enum/MiniEnum.m
r5597 r5631 9 9 % macro=MiniEnum() 10 10 11 macro=21 7;11 macro=213; -
issm/trunk/src/m/enum/MisfitEnum.m
r5597 r5631 9 9 % macro=MisfitEnum() 10 10 11 macro=16 8;11 macro=164; -
issm/trunk/src/m/enum/MixedLayerCapacityEnum.m
r5597 r5631 9 9 % macro=MixedLayerCapacityEnum() 10 10 11 macro=2 52;11 macro=248; -
issm/trunk/src/m/enum/NStepsEnum.m
r5597 r5631 9 9 % macro=NStepsEnum() 10 10 11 macro=28 5;11 macro=281; -
issm/trunk/src/m/enum/NdtEnum.m
r5597 r5631 9 9 % macro=NdtEnum() 10 10 11 macro=28 6;11 macro=282; -
issm/trunk/src/m/enum/NodalEnum.m
r5597 r5631 9 9 % macro=NodalEnum() 10 10 11 macro=30 8;11 macro=304; -
issm/trunk/src/m/enum/NodeOnBedEnum.m
r5597 r5631 9 9 % macro=NodeOnBedEnum() 10 10 11 macro=16 9;11 macro=165; -
issm/trunk/src/m/enum/NodeOnIceSheetEnum.m
r5597 r5631 9 9 % macro=NodeOnIceSheetEnum() 10 10 11 macro=1 70;11 macro=166; -
issm/trunk/src/m/enum/NodeOnIceShelfEnum.m
r5597 r5631 9 9 % macro=NodeOnIceShelfEnum() 10 10 11 macro=1 71;11 macro=167; -
issm/trunk/src/m/enum/NodeOnSurfaceEnum.m
r5597 r5631 9 9 % macro=NodeOnSurfaceEnum() 10 10 11 macro=1 72;11 macro=168; -
issm/trunk/src/m/enum/NumOutputEnum.m
r5597 r5631 9 9 % macro=NumOutputEnum() 10 10 11 macro=28 7;11 macro=283; -
issm/trunk/src/m/enum/NumRiftsEnum.m
r5597 r5631 9 9 % macro=NumRiftsEnum() 10 10 11 macro=28 8;11 macro=284; -
issm/trunk/src/m/enum/NumberNodeToElementConnectivityEnum.m
r5597 r5631 9 9 % macro=NumberNodeToElementConnectivityEnum() 10 10 11 macro=1 73;11 macro=169; -
issm/trunk/src/m/enum/NumberOfElementsEnum.m
r5597 r5631 9 9 % macro=NumberOfElementsEnum() 10 10 11 macro=28 9;11 macro=285; -
issm/trunk/src/m/enum/NumberOfNodesEnum.m
r5597 r5631 9 9 % macro=NumberOfNodesEnum() 10 10 11 macro=2 90;11 macro=286; -
issm/trunk/src/m/enum/NumberOfVerticesEnum.m
r5597 r5631 9 9 % macro=NumberOfVerticesEnum() 10 10 11 macro=2 91;11 macro=287; -
issm/trunk/src/m/enum/OldGradientEnum.m
r5597 r5631 9 9 % macro=OldGradientEnum() 10 10 11 macro=26 4;11 macro=260; -
issm/trunk/src/m/enum/OptScalEnum.m
r5597 r5631 9 9 % macro=OptScalEnum() 10 10 11 macro=2 92;11 macro=288; -
issm/trunk/src/m/enum/OutputFilePointerEnum.m
r5597 r5631 9 9 % macro=OutputFilePointerEnum() 10 10 11 macro=2 93;11 macro=289; -
issm/trunk/src/m/enum/OutputFrequencyEnum.m
r5597 r5631 9 9 % macro=OutputFrequencyEnum() 10 10 11 macro=2 33;11 macro=229; -
issm/trunk/src/m/enum/P0Enum.m
r5597 r5631 9 9 % macro=P0Enum() 10 10 11 macro=21 4;11 macro=210; -
issm/trunk/src/m/enum/P1DGEnum.m
r5597 r5631 9 9 % macro=P1DGEnum() 10 10 11 macro=21 6;11 macro=212; -
issm/trunk/src/m/enum/P1Enum.m
r5597 r5631 9 9 % macro=P1Enum() 10 10 11 macro=21 5;11 macro=211; -
issm/trunk/src/m/enum/ParameterOutputEnum.m
r5597 r5631 9 9 % macro=ParameterOutputEnum() 10 10 11 macro=29 4;11 macro=290; -
issm/trunk/src/m/enum/PatchEnum.m
r5597 r5631 9 9 % macro=PatchEnum() 10 10 11 macro=22 9;11 macro=225; -
issm/trunk/src/m/enum/PatchNodesEnum.m
r5597 r5631 9 9 % macro=PatchNodesEnum() 10 10 11 macro=2 31;11 macro=227; -
issm/trunk/src/m/enum/PatchVerticesEnum.m
r5597 r5631 9 9 % macro=PatchVerticesEnum() 10 10 11 macro=2 30;11 macro=226; -
issm/trunk/src/m/enum/PenaltyMeltingEnum.m
r5597 r5631 9 9 % macro=PenaltyMeltingEnum() 10 10 11 macro=29 5;11 macro=291; -
issm/trunk/src/m/enum/PenaltyOffsetEnum.m
r5597 r5631 9 9 % macro=PenaltyOffsetEnum() 10 10 11 macro=17 4;11 macro=170; -
issm/trunk/src/m/enum/PentaVertexElementResultEnum.m
r5597 r5631 9 9 % macro=PentaVertexElementResultEnum() 10 10 11 macro=2 20;11 macro=216; -
issm/trunk/src/m/enum/PetscVecExternalResultEnum.m
r5597 r5631 9 9 % macro=PetscVecExternalResultEnum() 10 10 11 macro=22 6;11 macro=222; -
issm/trunk/src/m/enum/PflagEnum.m
r5597 r5631 9 9 % macro=PflagEnum() 10 10 11 macro=17 5;11 macro=171; -
issm/trunk/src/m/enum/PressureEnum.m
r5597 r5631 9 9 % macro=PressureEnum() 10 10 11 macro=17 6;11 macro=172; -
issm/trunk/src/m/enum/PressureOldEnum.m
r5597 r5631 9 9 % macro=PressureOldEnum() 10 10 11 macro=17 7;11 macro=173; -
issm/trunk/src/m/enum/QmuAnalysisEnum.m
r5597 r5631 9 9 % macro=QmuAnalysisEnum() 10 10 11 macro=29 6;11 macro=292; -
issm/trunk/src/m/enum/QmuErrNameEnum.m
r5597 r5631 9 9 % macro=QmuErrNameEnum() 10 10 11 macro=29 7;11 macro=293; -
issm/trunk/src/m/enum/QmuInNameEnum.m
r5597 r5631 9 9 % macro=QmuInNameEnum() 10 10 11 macro=29 8;11 macro=294; -
issm/trunk/src/m/enum/QmuMassFluxSegmentsEnum.m
r5597 r5631 9 9 % macro=QmuMassFluxSegmentsEnum() 10 10 11 macro=29 9;11 macro=295; -
issm/trunk/src/m/enum/QmuNPartEnum.m
r5597 r5631 9 9 % macro=QmuNPartEnum() 10 10 11 macro= 300;11 macro=296; -
issm/trunk/src/m/enum/QmuNumberOfResponsesEnum.m
r5597 r5631 9 9 % macro=QmuNumberOfResponsesEnum() 10 10 11 macro= 303;11 macro=299; -
issm/trunk/src/m/enum/QmuOutNameEnum.m
r5597 r5631 9 9 % macro=QmuOutNameEnum() 10 10 11 macro= 301;11 macro=297; -
issm/trunk/src/m/enum/QmuPartEnum.m
r5597 r5631 9 9 % macro=QmuPartEnum() 10 10 11 macro= 302;11 macro=298; -
issm/trunk/src/m/enum/QmuPressureEnum.m
r5597 r5631 9 9 % macro=QmuPressureEnum() 10 10 11 macro=17 8;11 macro=174; -
issm/trunk/src/m/enum/QmuVxEnum.m
r5597 r5631 9 9 % macro=QmuVxEnum() 10 10 11 macro= 202;11 macro=198; -
issm/trunk/src/m/enum/QmuVyEnum.m
r5597 r5631 9 9 % macro=QmuVyEnum() 10 10 11 macro=20 7;11 macro=203; -
issm/trunk/src/m/enum/QmuVzEnum.m
r5597 r5631 9 9 % macro=QmuVzEnum() 10 10 11 macro=2 12;11 macro=208; -
issm/trunk/src/m/enum/RegularEnum.m
r5597 r5631 9 9 % macro=RegularEnum() 10 10 11 macro=30 5;11 macro=301; -
issm/trunk/src/m/enum/RelativeEnum.m
r5597 r5631 9 9 % macro=RelativeEnum() 10 10 11 macro=24 5;11 macro=241; -
issm/trunk/src/m/enum/ResetPenaltiesEnum.m
r5597 r5631 9 9 % macro=ResetPenaltiesEnum() 10 10 11 macro=17 9;11 macro=175; -
issm/trunk/src/m/enum/ResidualEnum.m
r5597 r5631 9 9 % macro=ResidualEnum() 10 10 11 macro=24 6;11 macro=242; -
issm/trunk/src/m/enum/ResponseDescriptorsEnum.m
r5597 r5631 9 9 % macro=ResponseDescriptorsEnum() 10 10 11 macro=30 9;11 macro=305; -
issm/trunk/src/m/enum/RheologyBEnum.m
r5597 r5631 9 9 % macro=RheologyBEnum() 10 10 11 macro=1 80;11 macro=176; -
issm/trunk/src/m/enum/RheologyBbarEnum.m
r5597 r5631 9 9 % macro=RheologyBbarEnum() 10 10 11 macro=1 81;11 macro=177; -
issm/trunk/src/m/enum/RheologyNEnum.m
r5597 r5631 9 9 % macro=RheologyNEnum() 10 10 11 macro=1 82;11 macro=178; -
issm/trunk/src/m/enum/RhoIceEnum.m
r5597 r5631 9 9 % macro=RhoIceEnum() 10 10 11 macro=24 8;11 macro=244; -
issm/trunk/src/m/enum/RhoWaterEnum.m
r5597 r5631 9 9 % macro=RhoWaterEnum() 10 10 11 macro=24 9;11 macro=245; -
issm/trunk/src/m/enum/ScaledEnum.m
r5597 r5631 9 9 % macro=ScaledEnum() 10 10 11 macro=30 7;11 macro=303; -
issm/trunk/src/m/enum/SegmentOnIceShelfEnum.m
r5597 r5631 9 9 % macro=SegmentOnIceShelfEnum() 10 10 11 macro=1 83;11 macro=179; -
issm/trunk/src/m/enum/SeparateEnum.m
r5597 r5631 9 9 % macro=SeparateEnum() 10 10 11 macro=25 6;11 macro=252; -
issm/trunk/src/m/enum/SolverStringEnum.m
r5597 r5631 9 9 % macro=SolverStringEnum() 10 10 11 macro=3 10;11 macro=306; -
issm/trunk/src/m/enum/SparsityEnum.m
r5597 r5631 9 9 % macro=SparsityEnum() 10 10 11 macro=3 11;11 macro=307; -
issm/trunk/src/m/enum/StabilizeConstraintsEnum.m
r5597 r5631 9 9 % macro=StabilizeConstraintsEnum() 10 10 11 macro=18 4;11 macro=180; -
issm/trunk/src/m/enum/StokesReconditioningEnum.m
r5597 r5631 9 9 % macro=StokesReconditioningEnum() 10 10 11 macro=18 5;11 macro=181; -
issm/trunk/src/m/enum/StringExternalResultEnum.m
r5597 r5631 9 9 % macro=StringExternalResultEnum() 10 10 11 macro=22 7;11 macro=223; -
issm/trunk/src/m/enum/StringToEnum.m
r5597 r5631 139 139 elseif (strcmpi(name,'CmResponse')), enum=CmResponseEnum(); return 140 140 elseif (strcmpi(name,'CmResponses')), enum=CmResponsesEnum(); return 141 elseif (strcmpi(name,'CmMaxDmpSlope')), enum=CmMaxDmpSlopeEnum(); return142 elseif (strcmpi(name,'CmMaxDmpValue')), enum=CmMaxDmpValueEnum(); return143 elseif (strcmpi(name,'CmMinDmpSlope')), enum=CmMinDmpSlopeEnum(); return144 elseif (strcmpi(name,'CmMinDmpValue')), enum=CmMinDmpValueEnum(); return145 141 elseif (strcmpi(name,'CmNoiseDmp')), enum=CmNoiseDmpEnum(); return 146 142 elseif (strcmpi(name,'Constant')), enum=ConstantEnum(); return -
issm/trunk/src/m/enum/SurfaceAbsVelMisfitEnum.m
r5597 r5631 9 9 % macro=SurfaceAbsVelMisfitEnum() 10 10 11 macro=15 9;11 macro=155; -
issm/trunk/src/m/enum/SurfaceAreaEnum.m
r5597 r5631 9 9 % macro=SurfaceAreaEnum() 10 10 11 macro=18 6;11 macro=182; -
issm/trunk/src/m/enum/SurfaceAverageVelMisfitEnum.m
r5597 r5631 9 9 % macro=SurfaceAverageVelMisfitEnum() 10 10 11 macro=1 63;11 macro=159; -
issm/trunk/src/m/enum/SurfaceEnum.m
r5597 r5631 9 9 % macro=SurfaceEnum() 10 10 11 macro=18 7;11 macro=183; -
issm/trunk/src/m/enum/SurfaceLogVelMisfitEnum.m
r5597 r5631 9 9 % macro=SurfaceLogVelMisfitEnum() 10 10 11 macro=1 61;11 macro=157; -
issm/trunk/src/m/enum/SurfaceLogVxVyMisfitEnum.m
r5597 r5631 9 9 % macro=SurfaceLogVxVyMisfitEnum() 10 10 11 macro=1 62;11 macro=158; -
issm/trunk/src/m/enum/SurfaceRelVelMisfitEnum.m
r5597 r5631 9 9 % macro=SurfaceRelVelMisfitEnum() 10 10 11 macro=1 60;11 macro=156; -
issm/trunk/src/m/enum/SurfaceSlopeXEnum.m
r5597 r5631 9 9 % macro=SurfaceSlopeXEnum() 10 10 11 macro=18 8;11 macro=184; -
issm/trunk/src/m/enum/SurfaceSlopeYEnum.m
r5597 r5631 9 9 % macro=SurfaceSlopeYEnum() 10 10 11 macro=18 9;11 macro=185; -
issm/trunk/src/m/enum/TemperatureEnum.m
r5597 r5631 9 9 % macro=TemperatureEnum() 10 10 11 macro=1 90;11 macro=186; -
issm/trunk/src/m/enum/TemperatureOldEnum.m
r5597 r5631 9 9 % macro=TemperatureOldEnum() 10 10 11 macro=1 91;11 macro=187; -
issm/trunk/src/m/enum/ThermalConductivityEnum.m
r5597 r5631 9 9 % macro=ThermalConductivityEnum() 10 10 11 macro=2 51;11 macro=247; -
issm/trunk/src/m/enum/ThermalExchangeVelocityEnum.m
r5597 r5631 9 9 % macro=ThermalExchangeVelocityEnum() 10 10 11 macro=2 53;11 macro=249; -
issm/trunk/src/m/enum/ThicknessAbsMisfitEnum.m
r5597 r5631 9 9 % macro=ThicknessAbsMisfitEnum() 10 10 11 macro=15 8;11 macro=154; -
issm/trunk/src/m/enum/ThicknessEnum.m
r5597 r5631 9 9 % macro=ThicknessEnum() 10 10 11 macro=1 92;11 macro=188; -
issm/trunk/src/m/enum/ThicknessObsEnum.m
r5597 r5631 9 9 % macro=ThicknessObsEnum() 10 10 11 macro=1 93;11 macro=189; -
issm/trunk/src/m/enum/TimeEnum.m
r5597 r5631 9 9 % macro=TimeEnum() 10 10 11 macro=2 32;11 macro=228; -
issm/trunk/src/m/enum/TolXEnum.m
r5597 r5631 9 9 % macro=TolXEnum() 10 10 11 macro=3 12;11 macro=308; -
issm/trunk/src/m/enum/TriaVertexElementResultEnum.m
r5597 r5631 9 9 % macro=TriaVertexElementResultEnum() 10 10 11 macro=21 9;11 macro=215; -
issm/trunk/src/m/enum/TypeEnum.m
r5597 r5631 9 9 % macro=TypeEnum() 10 10 11 macro=19 4;11 macro=190; -
issm/trunk/src/m/enum/VariableDescriptorsEnum.m
r5597 r5631 9 9 % macro=VariableDescriptorsEnum() 10 10 11 macro=3 13;11 macro=309; -
issm/trunk/src/m/enum/VelEnum.m
r5597 r5631 9 9 % macro=VelEnum() 10 10 11 macro=19 5;11 macro=191; -
issm/trunk/src/m/enum/VelObsEnum.m
r5597 r5631 9 9 % macro=VelObsEnum() 10 10 11 macro=19 6;11 macro=192; -
issm/trunk/src/m/enum/VerboseEnum.m
r5597 r5631 9 9 % macro=VerboseEnum() 10 10 11 macro=31 4;11 macro=310; -
issm/trunk/src/m/enum/ViscosityOvershootEnum.m
r5597 r5631 9 9 % macro=ViscosityOvershootEnum() 10 10 11 macro=19 7;11 macro=193; -
issm/trunk/src/m/enum/VxAverageEnum.m
r5597 r5631 9 9 % macro=VxAverageEnum() 10 10 11 macro=19 8;11 macro=194; -
issm/trunk/src/m/enum/VxEnum.m
r5597 r5631 9 9 % macro=VxEnum() 10 10 11 macro=19 9;11 macro=195; -
issm/trunk/src/m/enum/VxObsEnum.m
r5597 r5631 9 9 % macro=VxObsEnum() 10 10 11 macro= 200;11 macro=196; -
issm/trunk/src/m/enum/VxOldEnum.m
r5597 r5631 9 9 % macro=VxOldEnum() 10 10 11 macro= 201;11 macro=197; -
issm/trunk/src/m/enum/VyAverageEnum.m
r5597 r5631 9 9 % macro=VyAverageEnum() 10 10 11 macro= 203;11 macro=199; -
issm/trunk/src/m/enum/VyEnum.m
r5597 r5631 9 9 % macro=VyEnum() 10 10 11 macro=20 4;11 macro=200; -
issm/trunk/src/m/enum/VyObsEnum.m
r5597 r5631 9 9 % macro=VyObsEnum() 10 10 11 macro=20 5;11 macro=201; -
issm/trunk/src/m/enum/VyOldEnum.m
r5597 r5631 9 9 % macro=VyOldEnum() 10 10 11 macro=20 6;11 macro=202; -
issm/trunk/src/m/enum/VzAverageEnum.m
r5597 r5631 9 9 % macro=VzAverageEnum() 10 10 11 macro=20 8;11 macro=204; -
issm/trunk/src/m/enum/VzEnum.m
r5597 r5631 9 9 % macro=VzEnum() 10 10 11 macro=20 9;11 macro=205; -
issm/trunk/src/m/enum/VzObsEnum.m
r5597 r5631 9 9 % macro=VzObsEnum() 10 10 11 macro=2 10;11 macro=206; -
issm/trunk/src/m/enum/VzOldEnum.m
r5597 r5631 9 9 % macro=VzOldEnum() 10 10 11 macro=2 11;11 macro=207; -
issm/trunk/src/m/enum/WaitOnLockEnum.m
r5597 r5631 9 9 % macro=WaitOnLockEnum() 10 10 11 macro=31 5;11 macro=311; -
issm/trunk/src/m/enum/WeightsEnum.m
r5597 r5631 9 9 % macro=WeightsEnum() 10 10 11 macro=2 13;11 macro=209; -
issm/trunk/src/m/enum/YtsEnum.m
r5597 r5631 9 9 % macro=YtsEnum() 10 10 11 macro=31 6;11 macro=312; -
issm/trunk/src/m/solvers/solver_adjoint_linear.m
r5057 r5631 14 14 %Reduce tangent matrix from g size to f size 15 15 [K_ff, K_fs] = Reducematrixfromgtof( K_gg, femmodel.nodesets); 16 %K_ff=transpose(K_ff); 16 17 displaystring(femmodel.parameters.Verbose>1,'%s%g',' condition number of stiffness matrix: ',condest(K_ff)); 17 18
Note:
See TracChangeset
for help on using the changeset viewer.