Index: /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/analyses/diagnostic_core.cpp (revision 15567) @@ -56,5 +56,5 @@ if(VerboseSolution()) _printf0_(" computing SIA velocities\n"); - /*Take the last velocity into account so that the velocity on the MacAyeal domain is not zero*/ + /*Take the last velocity into account so that the velocity on the SSA domain is not zero*/ if(isSSA || isL1L2 || isHO ) ResetBoundaryConditions(femmodel,DiagnosticSIAAnalysisEnum); femmodel->SetCurrentConfiguration(DiagnosticSIAAnalysisEnum); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 15567) @@ -1193,8 +1193,8 @@ GetSolutionFromInputsDiagnosticFS(solution); } - else if (approximation==MacAyealApproximationEnum || approximation==HOApproximationEnum || approximation==SIAApproximationEnum){ + else if (approximation==SSAApproximationEnum || approximation==HOApproximationEnum || approximation==SIAApproximationEnum){ GetSolutionFromInputsDiagnosticHoriz(solution); } - else if (approximation==MacAyealHOApproximationEnum || approximation==HOFSApproximationEnum || approximation==MacAyealFSApproximationEnum){ + else if (approximation==SSAHOApproximationEnum || approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ return; //the elements around will create the solution } @@ -1970,12 +1970,12 @@ //Need to know the type of approximation for this element if(iomodel->Data(FlowequationElementEquationEnum)){ - if (iomodel->Data(FlowequationElementEquationEnum)[index]==MacAyealApproximationEnum){ - this->inputs->AddInput(new IntInput(ApproximationEnum,MacAyealApproximationEnum)); + if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAApproximationEnum){ + this->inputs->AddInput(new IntInput(ApproximationEnum,SSAApproximationEnum)); } else if (iomodel->Data(FlowequationElementEquationEnum)[index]==HOApproximationEnum){ this->inputs->AddInput(new IntInput(ApproximationEnum,HOApproximationEnum)); } - else if (iomodel->Data(FlowequationElementEquationEnum)[index]==MacAyealHOApproximationEnum){ - this->inputs->AddInput(new IntInput(ApproximationEnum,MacAyealHOApproximationEnum)); + else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAHOApproximationEnum){ + this->inputs->AddInput(new IntInput(ApproximationEnum,SSAHOApproximationEnum)); } else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SIAApproximationEnum){ @@ -1988,6 +1988,6 @@ this->inputs->AddInput(new IntInput(ApproximationEnum,FSApproximationEnum)); } - else if (iomodel->Data(FlowequationElementEquationEnum)[index]==MacAyealFSApproximationEnum){ - this->inputs->AddInput(new IntInput(ApproximationEnum,MacAyealFSApproximationEnum)); + else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAFSApproximationEnum){ + this->inputs->AddInput(new IntInput(ApproximationEnum,SSAFSApproximationEnum)); } else if (iomodel->Data(FlowequationElementEquationEnum)[index]==HOFSApproximationEnum){ @@ -2788,5 +2788,5 @@ /*For FS only: we want the CS to be tangential to the bedrock*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; + if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return; /*Get slope on each node*/ @@ -2883,5 +2883,5 @@ if(analysis_type==DiagnosticHorizAnalysisEnum){ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation==MacAyealHOApproximationEnum || approximation==MacAyealFSApproximationEnum){ + if(approximation==SSAHOApproximationEnum || approximation==SSAFSApproximationEnum){ parameters->FindParam(&numlayers,MeshNumberoflayersEnum); o_nz += numlayers*3; @@ -2999,10 +2999,10 @@ /*Bail out if this element if: - * -> Non MacAyeal not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -3194,16 +3194,16 @@ } } - if(*(iomodel->Data(FlowequationElementEquationEnum)+index)==MacAyealFSApproximationEnum){ - /*Create VzMacAyeal and VzFS Enums*/ + if(*(iomodel->Data(FlowequationElementEquationEnum)+index)==SSAFSApproximationEnum){ + /*Create VzSSA and VzFS Enums*/ if(iomodel->Data(VzEnum) && iomodel->Data(FlowequationBorderFSEnum)){ for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]*iomodel->Data(FlowequationBorderFSEnum)[penta_vertex_ids[i]-1]; this->inputs->AddInput(new PentaInput(VzFSEnum,nodeinputs,P1Enum)); for(i=0;i<6;i++) nodeinputs[i]=iomodel->Data(VzEnum)[penta_vertex_ids[i]-1]*(1-iomodel->Data(FlowequationBorderFSEnum)[penta_vertex_ids[i]-1]); - this->inputs->AddInput(new PentaInput(VzMacAyealEnum,nodeinputs,P1Enum)); + this->inputs->AddInput(new PentaInput(VzSSAEnum,nodeinputs,P1Enum)); } else{ for(i=0;i<6;i++)nodeinputs[i]=0; this->inputs->AddInput(new PentaInput(VzFSEnum,nodeinputs,P1Enum)); - this->inputs->AddInput(new PentaInput(VzMacAyealEnum,nodeinputs,P1Enum)); + this->inputs->AddInput(new PentaInput(VzSSAEnum,nodeinputs,P1Enum)); } } @@ -4774,6 +4774,6 @@ switch(approximation){ - case MacAyealApproximationEnum: - return CreateKMatrixAdjointMacAyeal2d(); + case SSAApproximationEnum: + return CreateKMatrixAdjointSSA2d(); case HOApproximationEnum: return CreateKMatrixAdjointHO(); @@ -4787,6 +4787,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixAdjointMacAyeal2d{{{*/ -ElementMatrix* Penta::CreateKMatrixAdjointMacAyeal2d(void){ +/*FUNCTION Penta::CreateKMatrixAdjointSSA2d{{{*/ +ElementMatrix* Penta::CreateKMatrixAdjointSSA2d(void){ /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the @@ -4810,5 +4810,5 @@ /*Call Tria function*/ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementMatrix* Ke=tria->CreateKMatrixAdjointMacAyeal(); + ElementMatrix* Ke=tria->CreateKMatrixAdjointSSA(); delete tria->material; delete tria; @@ -4971,6 +4971,6 @@ switch(approximation){ - case MacAyealApproximationEnum: - return CreatePVectorAdjointMacAyeal(); + case SSAApproximationEnum: + return CreatePVectorAdjointSSA(); case HOApproximationEnum: return CreatePVectorAdjointHO(); @@ -4984,6 +4984,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorAdjointMacAyeal{{{*/ -ElementVector* Penta::CreatePVectorAdjointMacAyeal(){ +/*FUNCTION Penta::CreatePVectorAdjointSSA{{{*/ +ElementVector* Penta::CreatePVectorAdjointSSA(){ if (!IsOnBed()) return NULL; @@ -5056,6 +5056,6 @@ inputs->GetInputValue(&approximation,ApproximationEnum); switch(approximation){ - case MacAyealApproximationEnum: - GradjDragMacAyeal(gradient,control_index); + case SSAApproximationEnum: + GradjDragSSA(gradient,control_index); break; case HOApproximationEnum: @@ -5076,6 +5076,6 @@ inputs->GetInputValue(&approximation,ApproximationEnum); switch(approximation){ - case MacAyealApproximationEnum: - GradjBbarMacAyeal(gradient,control_index); + case SSAApproximationEnum: + GradjBbarSSA(gradient,control_index); break; case HOApproximationEnum: @@ -5131,6 +5131,6 @@ } /*}}}*/ -/*FUNCTION Penta::GradjDragMacAyeal {{{*/ -void Penta::GradjDragMacAyeal(Vector* gradient,int control_index){ +/*FUNCTION Penta::GradjDragSSA {{{*/ +void Penta::GradjDragSSA(Vector* gradient,int control_index){ /*Gradient is 0 if on shelf or not on bed*/ @@ -5139,5 +5139,5 @@ /*Spawn tria*/ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - tria->GradjDragMacAyeal(gradient,control_index); + tria->GradjDragSSA(gradient,control_index); delete tria->material; delete tria; @@ -5306,6 +5306,6 @@ } /*}}}*/ -/*FUNCTION Penta::GradjBbarMacAyeal {{{*/ -void Penta::GradjBbarMacAyeal(Vector* gradient,int control_index){ +/*FUNCTION Penta::GradjBbarSSA {{{*/ +void Penta::GradjBbarSSA(Vector* gradient,int control_index){ /*This element should be collapsed into a tria element at its base*/ @@ -5317,5 +5317,5 @@ /*Collapse element to the base*/ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria (lower face). - tria->GradjBMacAyeal(gradient,control_index); + tria->GradjBSSA(gradient,control_index); delete tria->material; delete tria; @@ -5335,5 +5335,5 @@ /*Collapse element to the base*/ Tria* tria=(Tria*)SpawnTria(0,1,2); - tria->GradjBMacAyeal(gradient,control_index); //We use MacAyeal as an estimate for now + tria->GradjBSSA(gradient,control_index); //We use SSA as an estimate for now delete tria->material; delete tria; @@ -5352,5 +5352,5 @@ /*Collapse element to the base*/ Tria* tria=(Tria*)SpawnTria(0,1,2); - tria->GradjBMacAyeal(gradient,control_index); //We use MacAyeal as an estimate for now + tria->GradjBSSA(gradient,control_index); //We use SSA as an estimate for now delete tria->material; delete tria; @@ -5495,10 +5495,10 @@ /*Bail out if this element if: - * -> Non MacAyeal and not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA and not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -5532,10 +5532,10 @@ /*Bail out if this element if: - * -> Non MacAyeal and not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA and not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -5569,10 +5569,10 @@ /*Bail out if this element if: - * -> Non MacAyeal and not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA and not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -5608,10 +5608,10 @@ /*Bail out if this element if: - * -> Non MacAyeal and not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA and not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -5645,10 +5645,10 @@ /*Bail out if this element if: - * -> Non MacAyeal and not on the surface - * -> MacAyeal (2d model) and not on bed) */ - if ((approximation!=MacAyealApproximationEnum && !IsOnSurface()) || (approximation==MacAyealApproximationEnum && !IsOnBed())){ + * -> Non SSA and not on the surface + * -> SSA (2d model) and not on bed) */ + if ((approximation!=SSAApproximationEnum && !IsOnSurface()) || (approximation==SSAApproximationEnum && !IsOnBed())){ return 0; } - else if (approximation==MacAyealApproximationEnum){ + else if (approximation==SSAApproximationEnum){ /*This element should be collapsed into a tria element at its base. Create this tria element, @@ -5983,10 +5983,10 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealHO{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealHO(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAHO{{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAHO(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixCouplingMacAyealHOViscous(); - ElementMatrix* Ke2=CreateKMatrixCouplingMacAyealHOFriction(); + ElementMatrix* Ke1=CreateKMatrixCouplingSSAHOViscous(); + ElementMatrix* Ke2=CreateKMatrixCouplingSSAHOFriction(); ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); @@ -5997,6 +5997,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealHOViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealHOViscous(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAHOViscous{{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAHOViscous(void){ /*Constants*/ @@ -6036,5 +6036,5 @@ /*Initialize Element matrix*/ - ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); ElementMatrix* Ke2=new ElementMatrix(this->nodes ,NUMVERTICES,this->parameters,HOApproximationEnum); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); @@ -6058,6 +6058,6 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBMacAyealHO(&B[0][0], &xyz_list[0][0], gauss); - tria->GetBprimeMacAyeal(&Bprime[0][0], &xyz_list[0][0], gauss_tria); + GetBSSAHO(&B[0][0], &xyz_list[0][0], gauss); + tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); @@ -6090,6 +6090,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealHOFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealHOFriction(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAHOFriction{{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAHOFriction(void){ /*Constants*/ @@ -6115,5 +6115,5 @@ /*Initialize Element matrix and return if necessary*/ if(IsFloating() || !IsOnBed()) return NULL; - ElementMatrix* Ke1=new ElementMatrix(nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke1=new ElementMatrix(nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); ElementMatrix* Ke2=new ElementMatrix(nodes,NUMVERTICES,this->parameters,HOApproximationEnum); ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); @@ -6175,10 +6175,10 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealFS{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealFS(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAFS{{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAFS(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixCouplingMacAyealFSViscous(); - ElementMatrix* Ke2=CreateKMatrixCouplingMacAyealFSFriction(); + ElementMatrix* Ke1=CreateKMatrixCouplingSSAFSViscous(); + ElementMatrix* Ke2=CreateKMatrixCouplingSSAFSFriction(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); @@ -6189,6 +6189,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealFSViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealFSViscous(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAFSViscous{{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAFSViscous(void){ /*Constants*/ @@ -6233,5 +6233,5 @@ /*Initialize Element matrix and return if necessary*/ - ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke1=new ElementMatrix(pentabase->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); ElementMatrix* Ke2=new ElementMatrix(this->nodes ,NUMVERTICES,this->parameters,FSApproximationEnum); ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); @@ -6254,8 +6254,8 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBMacAyealFS(&B[0][0], &xyz_list[0][0], gauss); - tria->GetBprimeMacAyealFS(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBMacAyealFS(&B2[0][0], &xyz_list[0][0], gauss_tria); - GetBprimeMacAyealFS(&Bprime2[0][0], &xyz_list[0][0], gauss); + GetBSSAFS(&B[0][0], &xyz_list[0][0], gauss); + tria->GetBprimeSSAFS(&Bprime[0][0], &xyz_list[0][0], gauss_tria); + tria->GetBSSAFS(&B2[0][0], &xyz_list[0][0], gauss_tria); + GetBprimeSSAFS(&Bprime2[0][0], &xyz_list[0][0], gauss); this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); @@ -6293,6 +6293,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixCouplingMacAyealFSFriction {{{*/ -ElementMatrix* Penta::CreateKMatrixCouplingMacAyealFSFriction(void){ +/*FUNCTION Penta::CreateKMatrixCouplingSSAFSFriction {{{*/ +ElementMatrix* Penta::CreateKMatrixCouplingSSAFSFriction(void){ /*Constants*/ @@ -6313,10 +6313,10 @@ IssmDouble xyz_list[NUMVERTICES][3]; IssmDouble xyz_list_tria[NUMVERTICES2D][3]; - IssmDouble LMacAyealFS[8][numdof2dm]; - IssmDouble LprimeMacAyealFS[8][numdof2d]; - IssmDouble DLMacAyealFS[8][8]={0.0}; - IssmDouble LFSMacAyeal[4][numdof2d]; - IssmDouble LprimeFSMacAyeal[4][numdof2dm]; - IssmDouble DLFSMacAyeal[4][4]={0.0}; + IssmDouble LSSAFS[8][numdof2dm]; + IssmDouble LprimeSSAFS[8][numdof2d]; + IssmDouble DLSSAFS[8][8]={0.0}; + IssmDouble LFSSSA[4][numdof2d]; + IssmDouble LprimeFSSSA[4][numdof2dm]; + IssmDouble DLFSSSA[4][4]={0.0}; IssmDouble Ke_drag_gaussian[numdof2dm][numdof2d]; IssmDouble Ke_drag_gaussian2[numdof2d][numdof2dm]; @@ -6329,5 +6329,5 @@ inputs->GetInputValue(&approximation,ApproximationEnum); if(IsFloating() || !IsOnBed()) return NULL; - ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke1=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,SSAApproximationEnum); ElementMatrix* Ke2=new ElementMatrix(this->nodes,NUMVERTICES,this->parameters,FSApproximationEnum); ElementMatrix* Ke=new ElementMatrix(Ke1,Ke2); @@ -6361,8 +6361,8 @@ GetTriaJacobianDeterminant(&Jdet2d, &xyz_list_tria[0][0],gauss); - GetLMacAyealFS(&LMacAyealFS[0][0], gauss); - GetLprimeMacAyealFS(&LprimeMacAyealFS[0][0], &xyz_list[0][0], gauss); - GetLFSMacAyeal(&LFSMacAyeal[0][0], gauss); - GetLprimeFSMacAyeal(&LprimeFSMacAyeal[0][0], &xyz_list[0][0], gauss); + GetLSSAFS(&LSSAFS[0][0], gauss); + GetLprimeSSAFS(&LprimeSSAFS[0][0], &xyz_list[0][0], gauss); + GetLFSSSA(&LFSSSA[0][0], gauss); + GetLprimeFSSSA(&LprimeFSSSA[0][0], &xyz_list[0][0], gauss); this->GetStrainRate3d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); @@ -6372,26 +6372,26 @@ friction->GetAlpha2(&alpha2_gauss, gauss,VxEnum,VyEnum,VzEnum); - DLMacAyealFS[0][0]=alpha2_gauss*gauss->weight*Jdet2d; - DLMacAyealFS[1][1]=alpha2_gauss*gauss->weight*Jdet2d; - DLMacAyealFS[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; - DLMacAyealFS[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; - DLMacAyealFS[4][4]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[0]; - DLMacAyealFS[5][5]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[1]; - DLMacAyealFS[6][6]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[0]; - DLMacAyealFS[7][7]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[1]; - - DLFSMacAyeal[0][0]=alpha2_gauss*gauss->weight*Jdet2d; - DLFSMacAyeal[1][1]=alpha2_gauss*gauss->weight*Jdet2d; - DLFSMacAyeal[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; - DLFSMacAyeal[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; - - TripleMultiply( &LMacAyealFS[0][0],8,numdof2dm,1, - &DLMacAyealFS[0][0],8,8,0, - &LprimeMacAyealFS[0][0],8,numdof2d,0, + DLSSAFS[0][0]=alpha2_gauss*gauss->weight*Jdet2d; + DLSSAFS[1][1]=alpha2_gauss*gauss->weight*Jdet2d; + DLSSAFS[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; + DLSSAFS[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; + DLSSAFS[4][4]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[0]; + DLSSAFS[5][5]=-2*viscosity*gauss->weight*Jdet2d*bed_normal[1]; + DLSSAFS[6][6]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[0]; + DLSSAFS[7][7]=FSreconditioning*gauss->weight*Jdet2d*bed_normal[1]; + + DLFSSSA[0][0]=alpha2_gauss*gauss->weight*Jdet2d; + DLFSSSA[1][1]=alpha2_gauss*gauss->weight*Jdet2d; + DLFSSSA[2][2]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[0]*bed_normal[2]; + DLFSSSA[3][3]=-alpha2_gauss*gauss->weight*Jdet2d*bed_normal[1]*bed_normal[2]; + + TripleMultiply( &LSSAFS[0][0],8,numdof2dm,1, + &DLSSAFS[0][0],8,8,0, + &LprimeSSAFS[0][0],8,numdof2d,0, &Ke_drag_gaussian[0][0],0); - TripleMultiply( &LFSMacAyeal[0][0],4,numdof2d,1, - &DLFSMacAyeal[0][0],4,4,0, - &LprimeFSMacAyeal[0][0],4,numdof2dm,0, + TripleMultiply( &LFSSSA[0][0],4,numdof2d,1, + &DLFSSSA[0][0],4,4,0, + &LprimeFSSSA[0][0],4,numdof2dm,0, &Ke_drag_gaussian2[0][0],0); @@ -6465,6 +6465,6 @@ switch(approximation){ - case MacAyealApproximationEnum: - return CreateKMatrixDiagnosticMacAyeal2d(); + case SSAApproximationEnum: + return CreateKMatrixDiagnosticSSA2d(); case L1L2ApproximationEnum: return CreateKMatrixDiagnosticL1L2(); @@ -6477,8 +6477,8 @@ case NoneApproximationEnum: return NULL; - case MacAyealHOApproximationEnum: - return CreateKMatrixDiagnosticMacAyealHO(); - case MacAyealFSApproximationEnum: - return CreateKMatrixDiagnosticMacAyealFS(); + case SSAHOApproximationEnum: + return CreateKMatrixDiagnosticSSAHO(); + case SSAFSApproximationEnum: + return CreateKMatrixDiagnosticSSAFS(); case HOFSApproximationEnum: return CreateKMatrixDiagnosticHOFS(); @@ -6551,6 +6551,6 @@ return Ke; }/*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal2d{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal2d(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSA2d{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSA2d(void){ /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the @@ -6574,5 +6574,5 @@ /*Call Tria function*/ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementMatrix* Ke=tria->CreateKMatrixDiagnosticMacAyeal(); + ElementMatrix* Ke=tria->CreateKMatrixDiagnosticSSA(); delete tria->material; delete tria; @@ -6585,10 +6585,10 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3d{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3d(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSA3d{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSA3d(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal3dViscous(); - ElementMatrix* Ke2=CreateKMatrixDiagnosticMacAyeal3dFriction(); + ElementMatrix* Ke1=CreateKMatrixDiagnosticSSA3dViscous(); + ElementMatrix* Ke2=CreateKMatrixDiagnosticSSA3dFriction(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); @@ -6599,6 +6599,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dViscous{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dViscous(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSA3dViscous{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSA3dViscous(void){ /*Constants*/ @@ -6627,5 +6627,5 @@ /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke=new ElementMatrix(tria->nodes,NUMVERTICES2D,this->parameters,SSAApproximationEnum); inputs->GetInputValue(&approximation,ApproximationEnum); @@ -6648,8 +6648,8 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - tria->GetBMacAyeal(&B[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBprimeMacAyeal(&Bprime[0][0], &xyz_list[0][0], gauss_tria); - - if(approximation==MacAyealHOApproximationEnum){ + tria->GetBSSA(&B[0][0], &xyz_list[0][0], gauss_tria); + tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); + + if(approximation==SSAHOApproximationEnum){ this->GetStrainRate3dHO(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); this->GetStrainRate3dHO(&oldepsilon[0],&xyz_list[0][0],gauss,vxold_input,vyold_input); @@ -6659,5 +6659,5 @@ newviscosity=viscosity+viscosity_overshoot*(viscosity-oldviscosity); } - else if (approximation==MacAyealFSApproximationEnum){ + else if (approximation==SSAFSApproximationEnum){ this->GetStrainRate3d(&epsilons[0],&xyz_list[0][0],gauss,vx_input,vy_input,vz_input); material->GetViscosity3dFS(&newviscosity,&epsilons[0]); @@ -6687,6 +6687,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyeal3dFriction{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyeal3dFriction(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSA3dFriction{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSA3dFriction(void){ /*Initialize Element matrix and return if necessary*/ @@ -6697,5 +6697,5 @@ * nodes: */ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementMatrix* Ke=tria->CreateKMatrixDiagnosticMacAyealFriction(); + ElementMatrix* Ke=tria->CreateKMatrixDiagnosticSSAFriction(); delete tria->material; delete tria; @@ -6704,11 +6704,11 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealHO{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealHO(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSAHO{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSAHO(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal3d(); + ElementMatrix* Ke1=CreateKMatrixDiagnosticSSA3d(); ElementMatrix* Ke2=CreateKMatrixDiagnosticHO(); - ElementMatrix* Ke3=CreateKMatrixCouplingMacAyealHO(); + ElementMatrix* Ke3=CreateKMatrixCouplingSSAHO(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); @@ -6720,11 +6720,11 @@ } /*}}}*/ -/*FUNCTION Penta::CreateKMatrixDiagnosticMacAyealFS{{{*/ -ElementMatrix* Penta::CreateKMatrixDiagnosticMacAyealFS(void){ +/*FUNCTION Penta::CreateKMatrixDiagnosticSSAFS{{{*/ +ElementMatrix* Penta::CreateKMatrixDiagnosticSSAFS(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyeal3d(); + ElementMatrix* Ke1=CreateKMatrixDiagnosticSSA3d(); ElementMatrix* Ke2=CreateKMatrixDiagnosticFS(); - ElementMatrix* Ke3=CreateKMatrixCouplingMacAyealFS(); + ElementMatrix* Ke3=CreateKMatrixCouplingSSAFS(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2,Ke3); @@ -6792,6 +6792,6 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - tria->GetBMacAyeal(&B[0][0], &xyz_list[0][0], gauss_tria); - tria->GetBprimeMacAyeal(&Bprime[0][0], &xyz_list[0][0], gauss_tria); + tria->GetBSSA(&B[0][0], &xyz_list[0][0], gauss_tria); + tria->GetBprimeSSA(&Bprime[0][0], &xyz_list[0][0], gauss_tria); /*Get viscosity for L1L2 model*/ @@ -6828,5 +6828,5 @@ * nodes: */ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementMatrix* Ke=tria->CreateKMatrixDiagnosticMacAyealFriction(); + ElementMatrix* Ke=tria->CreateKMatrixDiagnosticSSAFriction(); delete tria->material; delete tria; @@ -7051,5 +7051,5 @@ /*If on water or not FS, skip stiffness: */ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -7130,5 +7130,5 @@ /*If on water or not FS, skip stiffness: */ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -7258,5 +7258,5 @@ /*If on water or not FS, skip stiffness: */ inputs->GetInputValue(&approximation,ApproximationEnum); - if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum)) return NULL; + if(IsFloating() || !IsOnBed() || (approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum)) return NULL; ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -7412,10 +7412,10 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealFS {{{*/ -ElementVector* Penta::CreatePVectorCouplingMacAyealFS(void){ +/*FUNCTION Penta::CreatePVectorCouplingSSAFS {{{*/ +ElementVector* Penta::CreatePVectorCouplingSSAFS(void){ /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorCouplingMacAyealFSViscous(); - ElementVector* pe2=CreatePVectorCouplingMacAyealFSFriction(); + ElementVector* pe1=CreatePVectorCouplingSSAFSViscous(); + ElementVector* pe2=CreatePVectorCouplingSSAFSFriction(); ElementVector* pe =new ElementVector(pe1,pe2); @@ -7426,6 +7426,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealFSViscous {{{*/ -ElementVector* Penta::CreatePVectorCouplingMacAyealFSViscous(void){ +/*FUNCTION Penta::CreatePVectorCouplingSSAFSViscous {{{*/ +ElementVector* Penta::CreatePVectorCouplingSSAFSViscous(void){ /*Constants*/ @@ -7446,5 +7446,5 @@ /*Initialize Element vector and return if necessary*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=MacAyealFSApproximationEnum) return NULL; + if(approximation!=SSAFSApproximationEnum) return NULL; ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -7455,5 +7455,5 @@ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzSSA_input=inputs->GetInput(VzMacAyealEnum); _assert_(vzSSA_input); + Input* vzSSA_input=inputs->GetInput(VzSSAEnum); _assert_(vzSSA_input); /* Start looping on the number of gaussian points: */ @@ -7488,6 +7488,6 @@ } /*}}}*/ -/*FUNCTION Penta::CreatePVectorCouplingMacAyealFSFriction{{{*/ -ElementVector* Penta::CreatePVectorCouplingMacAyealFSFriction(void){ +/*FUNCTION Penta::CreatePVectorCouplingSSAFSFriction{{{*/ +ElementVector* Penta::CreatePVectorCouplingSSAFSFriction(void){ /*Constants*/ @@ -7513,5 +7513,5 @@ if(!IsOnBed() || IsFloating()) return NULL; inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=MacAyealFSApproximationEnum) return NULL; + if(approximation!=SSAFSApproximationEnum) return NULL; ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -7523,5 +7523,5 @@ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); Input* vz_input=inputs->GetInput(VzEnum); _assert_(vz_input); - Input* vzSSA_input=inputs->GetInput(VzMacAyealEnum); _assert_(vzSSA_input); + Input* vzSSA_input=inputs->GetInput(VzSSAEnum); _assert_(vzSSA_input); for(i=0;iCreatePVectorDiagnosticMacAyeal(); + ElementVector* pe=tria->CreatePVectorDiagnosticSSA(); delete tria->material; delete tria; @@ -7896,5 +7896,5 @@ /*Call Tria function*/ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementVector* pe=tria->CreatePVectorDiagnosticMacAyeal(); + ElementVector* pe=tria->CreatePVectorDiagnosticSSA(); delete tria->material; delete tria; @@ -8106,5 +8106,5 @@ /*Initialize Element vector and return if necessary*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -8276,5 +8276,5 @@ /*Initialize Element vector and return if necessary*/ inputs->GetInputValue(&approximation,ApproximationEnum); - if(approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; parameters->FindParam(&FSreconditioning,DiagnosticFSreconditioningEnum); ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -8392,5 +8392,5 @@ inputs->GetInputValue(&approximation,ApproximationEnum); this->parameters->FindParam(&shelf_dampening,DiagnosticShelfDampeningEnum); - if(approximation!=FSApproximationEnum && approximation!=MacAyealFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; + if(approximation!=FSApproximationEnum && approximation!=SSAFSApproximationEnum && approximation!=HOFSApproximationEnum) return NULL; ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters,FSApproximationEnum); @@ -8478,5 +8478,5 @@ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); Input* vzFS_input=NULL; - if(approximation==HOFSApproximationEnum || approximation==MacAyealFSApproximationEnum){ + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ vzFS_input=inputs->GetInput(VzFSEnum); _assert_(vzFS_input); } @@ -8493,5 +8493,5 @@ vx_input->GetInputDerivativeValue(&du[0],&xyz_list[0][0],gauss); vy_input->GetInputDerivativeValue(&dv[0],&xyz_list[0][0],gauss); - if(approximation==HOFSApproximationEnum || approximation==MacAyealFSApproximationEnum){ + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ vzFS_input->GetInputDerivativeValue(&dw[0],&xyz_list[0][0],gauss); dwdz=dw[2]; @@ -8540,5 +8540,5 @@ Input* vy_input=inputs->GetInput(VyEnum); _assert_(vy_input); Input* vzFS_input=NULL; - if(approximation==HOFSApproximationEnum || approximation==MacAyealFSApproximationEnum){ + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ vzFS_input=inputs->GetInput(VzFSEnum); _assert_(vzFS_input); } @@ -8554,5 +8554,5 @@ vx_input->GetInputValue(&vx, gauss); vy_input->GetInputValue(&vy, gauss); - if(approximation==HOFSApproximationEnum || approximation==MacAyealFSApproximationEnum){ + if(approximation==HOFSApproximationEnum || approximation==SSAFSApproximationEnum){ vzFS_input->GetInputValue(&vz, gauss); } @@ -8580,5 +8580,5 @@ switch(approximation){ - case MacAyealApproximationEnum: + case SSAApproximationEnum: return CreateJacobianDiagnosticSSA2d(); case HOApproximationEnum: @@ -8784,5 +8784,5 @@ /*If the element is a coupling, do nothing: every node is also on an other elements - * (as coupling is between MacAyeal and HO) so the other element will take care of it*/ + * (as coupling is between SSA and HO) so the other element will take care of it*/ GetDofList(&doflist,approximation,GsetEnum); @@ -8999,6 +8999,6 @@ inputs->GetInputValue(&approximation,ApproximationEnum); - /*MacAyeal, everything is done by the element on bed*/ - if (approximation==MacAyealApproximationEnum){ + /*SSA, everything is done by the element on bed*/ + if (approximation==SSAApproximationEnum){ if (!IsOnBed()){ /*Do nothing. Element on bed will take care of it*/ @@ -9006,5 +9006,5 @@ } else{ - InputUpdateFromSolutionDiagnosticMacAyeal(solution); + InputUpdateFromSolutionDiagnosticSSA(solution); return; } @@ -9021,17 +9021,17 @@ InputUpdateFromSolutionDiagnosticHOFS(solution); } - else if (approximation==MacAyealFSApproximationEnum){ - InputUpdateFromSolutionDiagnosticMacAyealFS(solution); + else if (approximation==SSAFSApproximationEnum){ + InputUpdateFromSolutionDiagnosticSSAFS(solution); } else if (approximation==FSApproximationEnum || approximation==NoneApproximationEnum){ InputUpdateFromSolutionDiagnosticFS(solution); } - else if (approximation==MacAyealHOApproximationEnum){ - InputUpdateFromSolutionDiagnosticMacAyealHO(solution); - } -} -/*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyeal {{{*/ -void Penta::InputUpdateFromSolutionDiagnosticMacAyeal(IssmDouble* solution){ + else if (approximation==SSAHOApproximationEnum){ + InputUpdateFromSolutionDiagnosticSSAHO(solution); + } +} +/*}}}*/ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticSSA {{{*/ +void Penta::InputUpdateFromSolutionDiagnosticSSA(IssmDouble* solution){ const int numdof=NDOF2*NUMVERTICES; @@ -9051,5 +9051,5 @@ /*Get dof list: */ - GetDofList(&doflist,MacAyealApproximationEnum,GsetEnum); + GetDofList(&doflist,SSAApproximationEnum,GsetEnum); /*Use the dof list to index into the solution vector: */ @@ -9113,6 +9113,6 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealHO {{{*/ -void Penta::InputUpdateFromSolutionDiagnosticMacAyealHO(IssmDouble* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticSSAHO {{{*/ +void Penta::InputUpdateFromSolutionDiagnosticSSAHO(IssmDouble* solution){ const int numdof=NDOF2*NUMVERTICES; @@ -9140,5 +9140,5 @@ /*Get dof listof this element (HO dofs) and of the penta at base (SSA dofs): */ GetDofList(&doflistp,HOApproximationEnum,GsetEnum); - penta->GetDofList(&doflistm,MacAyealApproximationEnum,GsetEnum); + penta->GetDofList(&doflistm,SSAApproximationEnum,GsetEnum); /*Get node data: */ @@ -9197,6 +9197,6 @@ } /*}}}*/ -/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticMacAyealFS {{{*/ -void Penta::InputUpdateFromSolutionDiagnosticMacAyealFS(IssmDouble* solution){ +/*FUNCTION Penta::InputUpdateFromSolutionDiagnosticSSAFS {{{*/ +void Penta::InputUpdateFromSolutionDiagnosticSSAFS(IssmDouble* solution){ const int numdofm=NDOF2*NUMVERTICES; @@ -9225,5 +9225,5 @@ /*Get dof listof this element (SSA dofs) and of the penta at base (SSA dofs): */ - penta->GetDofList(&doflistm,MacAyealApproximationEnum,GsetEnum); + penta->GetDofList(&doflistm,SSAApproximationEnum,GsetEnum); GetDofList(&doflists,FSApproximationEnum,GsetEnum); this->parameters->FindParam(&FSreconditioning,DiagnosticFSreconditioningEnum); @@ -9260,13 +9260,13 @@ /*Get Vz*/ - Input* vzSSA_input=inputs->GetInput(VzMacAyealEnum); + Input* vzSSA_input=inputs->GetInput(VzSSAEnum); if (vzSSA_input){ if (vzSSA_input->ObjectEnum()!=PentaInputEnum){ - _error_("Cannot compute Vel as VzMacAyeal is of type " << EnumToStringx(vzSSA_input->ObjectEnum())); - } - GetInputListOnVertices(&vzSSA[0],VzMacAyealEnum); + _error_("Cannot compute Vel as VzSSA is of type " << EnumToStringx(vzSSA_input->ObjectEnum())); + } + GetInputListOnVertices(&vzSSA[0],VzSSAEnum); } else{ - _error_("Cannot update solution as VzMacAyeal is not present"); + _error_("Cannot update solution as VzSSA is not present"); } @@ -9653,5 +9653,5 @@ GetInputListOnVertices(&vy[0],VyEnum,0.0); //default is 0 - /*Do some modifications if we actually have a HOFS or MacAyealFS element*/ + /*Do some modifications if we actually have a HOFS or SSAFS element*/ if(approximation==HOFSApproximationEnum){ Input* vzFS_input=inputs->GetInput(VzFSEnum); @@ -9666,5 +9666,5 @@ } } - else if(approximation==MacAyealFSApproximationEnum){ + else if(approximation==SSAFSApproximationEnum){ Input* vzFS_input=inputs->GetInput(VzFSEnum); if (vzFS_input){ @@ -9672,5 +9672,5 @@ GetInputListOnVertices(&vzFS[0],VzFSEnum); } - else _error_("Cannot compute Vz as VzFS in not present in MacAyealFS element"); + else _error_("Cannot compute Vz as VzFS in not present in SSAFS element"); for(i=0;iGetRhoIce(); g=matpar->GetG(); @@ -9695,5 +9695,5 @@ this->inputs->ChangeEnum(VzEnum,VzPicardEnum); - if(approximation!=HOFSApproximationEnum && approximation!=MacAyealFSApproximationEnum){ + if(approximation!=HOFSApproximationEnum && approximation!=SSAFSApproximationEnum){ this->inputs->ChangeEnum(PressureEnum,PressurePicardEnum); this->inputs->AddInput(new PentaInput(PressureEnum,pressure,P1Enum)); @@ -9702,6 +9702,6 @@ this->inputs->AddInput(new PentaInput(VzHOEnum,vzHO,P1Enum)); } - else if(approximation==MacAyealFSApproximationEnum){ - this->inputs->AddInput(new PentaInput(VzMacAyealEnum,vzSSA,P1Enum)); + else if(approximation==SSAFSApproximationEnum){ + this->inputs->AddInput(new PentaInput(VzSSAEnum,vzSSA,P1Enum)); } this->inputs->AddInput(new PentaInput(VzEnum,vz,P1Enum)); Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.h (revision 15567) @@ -144,8 +144,8 @@ void GradientIndexing(int* indexing,int control_index); void Gradj(Vector* gradient,int control_type,int control_index); - void GradjDragMacAyeal(Vector* gradient,int control_index); + void GradjDragSSA(Vector* gradient,int control_index); void GradjDragHO(Vector* gradient,int control_index); void GradjDragFS(Vector* gradient,int control_index); - void GradjBbarMacAyeal(Vector* gradient,int control_index); + void GradjBbarSSA(Vector* gradient,int control_index); void GradjBbarHO(Vector* gradient,int control_index); void GradjBbarFS(Vector* gradient,int control_index); @@ -223,10 +223,10 @@ #ifdef _HAVE_DIAGNOSTIC_ - ElementMatrix* CreateKMatrixCouplingMacAyealHO(void); - ElementMatrix* CreateKMatrixCouplingMacAyealHOViscous(void); - ElementMatrix* CreateKMatrixCouplingMacAyealHOFriction(void); - ElementMatrix* CreateKMatrixCouplingMacAyealFS(void); - ElementMatrix* CreateKMatrixCouplingMacAyealFSViscous(void); - ElementMatrix* CreateKMatrixCouplingMacAyealFSFriction(void); + ElementMatrix* CreateKMatrixCouplingSSAHO(void); + ElementMatrix* CreateKMatrixCouplingSSAHOViscous(void); + ElementMatrix* CreateKMatrixCouplingSSAHOFriction(void); + ElementMatrix* CreateKMatrixCouplingSSAFS(void); + ElementMatrix* CreateKMatrixCouplingSSAFSViscous(void); + ElementMatrix* CreateKMatrixCouplingSSAFSFriction(void); ElementMatrix* CreateKMatrixCouplingHOFS(void); ElementMatrix* CreateKMatrixDiagnosticHoriz(void); @@ -235,10 +235,10 @@ ElementVector* CreateDVectorDiagnosticFS(void); ElementMatrix* CreateKMatrixDiagnosticSIA(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyeal2d(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyeal3d(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyeal3dViscous(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyeal3dFriction(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyealHO(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyealFS(void); + ElementMatrix* CreateKMatrixDiagnosticSSA2d(void); + ElementMatrix* CreateKMatrixDiagnosticSSA3d(void); + ElementMatrix* CreateKMatrixDiagnosticSSA3dViscous(void); + ElementMatrix* CreateKMatrixDiagnosticSSA3dFriction(void); + ElementMatrix* CreateKMatrixDiagnosticSSAHO(void); + ElementMatrix* CreateKMatrixDiagnosticSSAFS(void); ElementMatrix* CreateKMatrixDiagnosticL1L2(void); ElementMatrix* CreateKMatrixDiagnosticL1L2Viscous(void); @@ -261,7 +261,7 @@ ElementMatrix* CreateJacobianDiagnosticFS(void); void InputUpdateFromSolutionDiagnosticHoriz( IssmDouble* solutiong); - void InputUpdateFromSolutionDiagnosticMacAyeal( IssmDouble* solutiong); - void InputUpdateFromSolutionDiagnosticMacAyealHO( IssmDouble* solutiong); - void InputUpdateFromSolutionDiagnosticMacAyealFS( IssmDouble* solutiong); + void InputUpdateFromSolutionDiagnosticSSA( IssmDouble* solutiong); + void InputUpdateFromSolutionDiagnosticSSAHO( IssmDouble* solutiong); + void InputUpdateFromSolutionDiagnosticSSAFS( IssmDouble* solutiong); void InputUpdateFromSolutionDiagnosticL1L2( IssmDouble* solutiong); void InputUpdateFromSolutionDiagnosticHO( IssmDouble* solutiong); @@ -274,7 +274,7 @@ void GetSolutionFromInputsDiagnosticFS(Vector* solutiong); void GetSolutionFromInputsDiagnosticVert(Vector* solutiong); - ElementVector* CreatePVectorCouplingMacAyealFS(void); - ElementVector* CreatePVectorCouplingMacAyealFSViscous(void); - ElementVector* CreatePVectorCouplingMacAyealFSFriction(void); + ElementVector* CreatePVectorCouplingSSAFS(void); + ElementVector* CreatePVectorCouplingSSAFSViscous(void); + ElementVector* CreatePVectorCouplingSSAFSFriction(void); ElementVector* CreatePVectorCouplingHOFS(void); ElementVector* CreatePVectorCouplingHOFSViscous(void); @@ -282,7 +282,7 @@ ElementVector* CreatePVectorDiagnosticHoriz(void); ElementVector* CreatePVectorDiagnosticSIA(void); - ElementVector* CreatePVectorDiagnosticMacAyeal(void); - ElementVector* CreatePVectorDiagnosticMacAyealHO(void); - ElementVector* CreatePVectorDiagnosticMacAyealFS(void); + ElementVector* CreatePVectorDiagnosticSSA(void); + ElementVector* CreatePVectorDiagnosticSSAHO(void); + ElementVector* CreatePVectorDiagnosticSSAFS(void); ElementVector* CreatePVectorDiagnosticL1L2(void); ElementVector* CreatePVectorDiagnosticHO(void); @@ -303,8 +303,8 @@ #ifdef _HAVE_CONTROL_ ElementVector* CreatePVectorAdjointHoriz(void); - ElementMatrix* CreateKMatrixAdjointMacAyeal2d(void); + ElementMatrix* CreateKMatrixAdjointSSA2d(void); ElementMatrix* CreateKMatrixAdjointHO(void); ElementMatrix* CreateKMatrixAdjointFS(void); - ElementVector* CreatePVectorAdjointMacAyeal(void); + ElementVector* CreatePVectorAdjointSSA(void); ElementVector* CreatePVectorAdjointHO(void); ElementVector* CreatePVectorAdjointFS(void); Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.cpp (revision 15567) @@ -54,6 +54,6 @@ /*Reference Element numerics*/ -/*FUNCTION PentaRef::GetBMacAyealHO {{{*/ -void PentaRef::GetBMacAyealHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetBSSAHO {{{*/ +void PentaRef::GetBSSAHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. * For node i, Bi can be expressed in the actual coordinate system @@ -85,6 +85,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBMacAyealFS{{{*/ -void PentaRef::GetBMacAyealFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetBSSAFS{{{*/ +void PentaRef::GetBSSAFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss){ /*Compute B matrix. B=[B1 B2 B3 B4 B5 B6] where Bi is of size 5*NDOF2. * For node i, Bi can be expressed in the actual coordinate system @@ -209,6 +209,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetBprimeMacAyealFS{{{*/ -void PentaRef::GetBprimeMacAyealFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetBprimeSSAFS{{{*/ +void PentaRef::GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss){ /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3 Bprime4 Bprime5 Bprime6] where Bprimei is of size 5*NDOF2. * For node i, Bprimei can be expressed in the actual coordinate system @@ -786,6 +786,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLMacAyealFS {{{*/ -void PentaRef::GetLMacAyealFS(IssmDouble* LFS, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetLSSAFS {{{*/ +void PentaRef::GetLSSAFS(IssmDouble* LFS, GaussPenta* gauss){ /* * Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. @@ -832,6 +832,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLprimeMacAyealFS {{{*/ -void PentaRef::GetLprimeMacAyealFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetLprimeSSAFS {{{*/ +void PentaRef::GetLprimeSSAFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. * For node i, Lpi can be expressed in the actual coordinate system @@ -895,6 +895,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLFSMacAyeal {{{*/ -void PentaRef::GetLFSMacAyeal(IssmDouble* LFS, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetLFSSSA {{{*/ +void PentaRef::GetLFSSSA(IssmDouble* LFS, GaussPenta* gauss){ /* Compute L matrix. L=[L1 L2 L3] where Li is square and of size numdof. * For node i, Li can be expressed in the actual coordinate system @@ -936,6 +936,6 @@ } /*}}}*/ -/*FUNCTION PentaRef::GetLprimeFSMacAyeal {{{*/ -void PentaRef::GetLprimeFSMacAyeal(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ +/*FUNCTION PentaRef::GetLprimeFSSSA {{{*/ +void PentaRef::GetLprimeFSSSA(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss){ /* Compute Lprime matrix. Lprime=[Lp1 Lp2 Lp3] where Lpi is square and of size numdof. * For node i, Lpi can be expressed in the actual coordinate system Index: /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/PentaRef.h (revision 15567) @@ -38,10 +38,10 @@ void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussPenta* gauss); void GetJacobianInvert(IssmDouble* Jinv, IssmDouble* xyz_list,GaussPenta* gauss); - void GetBMacAyealHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBMacAyealFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); + void GetBSSAHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); + void GetBSSAFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); void GetBHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); void GetBFS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); void GetBFSGLS(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); - void GetBprimeMacAyealFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss); + void GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussPenta* gauss); void GetBprimeHO(IssmDouble* B, IssmDouble* xyz_list, GaussPenta* gauss); void GetBprimeFS(IssmDouble* B_prime, IssmDouble* xyz_list, GaussPenta* gauss); @@ -55,8 +55,8 @@ void GetLFS(IssmDouble* LFS, GaussPenta* gauss); void GetLprimeFS(IssmDouble* LprimeFS, IssmDouble* xyz_list, GaussPenta* gauss); - void GetLMacAyealFS(IssmDouble* LMacAyealFS, GaussPenta* gauss); - void GetLprimeMacAyealFS(IssmDouble* LprimeMacAyealFS, IssmDouble* xyz_list, GaussPenta* gauss); - void GetLFSMacAyeal(IssmDouble* LFSMacAyeal, GaussPenta* gauss); - void GetLprimeFSMacAyeal(IssmDouble* LprimeFSMacAyeal, IssmDouble* xyz_list, GaussPenta* gauss); + void GetLSSAFS(IssmDouble* LSSAFS, GaussPenta* gauss); + void GetLprimeSSAFS(IssmDouble* LprimeSSAFS, IssmDouble* xyz_list, GaussPenta* gauss); + void GetLFSSSA(IssmDouble* LFSSSA, GaussPenta* gauss); + void GetLprimeFSSSA(IssmDouble* LprimeFSSSA, IssmDouble* xyz_list, GaussPenta* gauss); void GetInputValue(IssmDouble* pvalue,IssmDouble* plist, GaussPenta* gauss); void GetInputValue(IssmDouble* pvalue,IssmDouble* plist,GaussTria* gauss){_error_("only PentaGauss are supported");}; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15567) @@ -191,5 +191,5 @@ #ifdef _HAVE_DIAGNOSTIC_ case DiagnosticHorizAnalysisEnum: - Ke=CreateKMatrixDiagnosticMacAyeal(); + Ke=CreateKMatrixDiagnosticSSA(); break; case DiagnosticSIAAnalysisEnum: @@ -224,5 +224,5 @@ break; case AdjointHorizAnalysisEnum: - Ke=CreateKMatrixAdjointMacAyeal(); + Ke=CreateKMatrixAdjointSSA(); break; #endif @@ -304,5 +304,5 @@ #ifdef _HAVE_DIAGNOSTIC_ case DiagnosticHorizAnalysisEnum: - pe=CreatePVectorDiagnosticMacAyeal(); + pe=CreatePVectorDiagnosticSSA(); break; case DiagnosticSIAAnalysisEnum: @@ -2886,10 +2886,10 @@ #ifdef _HAVE_DIAGNOSTIC_ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyeal {{{*/ -ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyeal(void){ +/*FUNCTION Tria::CreateKMatrixDiagnosticSSA {{{*/ +ElementMatrix* Tria::CreateKMatrixDiagnosticSSA(void){ /*compute all stiffness matrices for this element*/ - ElementMatrix* Ke1=CreateKMatrixDiagnosticMacAyealViscous(); - ElementMatrix* Ke2=CreateKMatrixDiagnosticMacAyealFriction(); + ElementMatrix* Ke1=CreateKMatrixDiagnosticSSAViscous(); + ElementMatrix* Ke2=CreateKMatrixDiagnosticSSAFriction(); ElementMatrix* Ke =new ElementMatrix(Ke1,Ke2); @@ -2900,6 +2900,6 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealViscous{{{*/ -ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealViscous(void){ +/*FUNCTION Tria::CreateKMatrixDiagnosticSSAViscous{{{*/ +ElementMatrix* Tria::CreateKMatrixDiagnosticSSAViscous(void){ /*Intermediaries*/ @@ -2916,5 +2916,5 @@ /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,SSAApproximationEnum); IssmDouble* B = xNew(3*numdof); IssmDouble* Bprime = xNew(3*numdof); @@ -2937,6 +2937,6 @@ GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); - GetBMacAyeal(&B[0], &xyz_list[0][0], gauss); - GetBprimeMacAyeal(&Bprime[0], &xyz_list[0][0], gauss); + GetBSSA(&B[0], &xyz_list[0][0], gauss); + GetBprimeSSA(&Bprime[0], &xyz_list[0][0], gauss); this->GetStrainRate2d(&epsilon[0],&xyz_list[0][0],gauss,vx_input,vy_input); @@ -2967,6 +2967,6 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixDiagnosticMacAyealFriction {{{*/ -ElementMatrix* Tria::CreateKMatrixDiagnosticMacAyealFriction(void){ +/*FUNCTION Tria::CreateKMatrixDiagnosticSSAFriction {{{*/ +ElementMatrix* Tria::CreateKMatrixDiagnosticSSAFriction(void){ /*Intermediaries*/ @@ -2993,5 +2993,5 @@ /*Initialize Element matrix and vectors*/ - ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,MacAyealApproximationEnum); + ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,SSAApproximationEnum); IssmDouble* B = xNew(2*numdof); IssmDouble* D = xNewZeroInit(2*2); @@ -3033,5 +3033,5 @@ } - GetBMacAyealFriction(&B[0], &xyz_list[0][0], gauss); + GetBSSAFriction(&B[0], &xyz_list[0][0], gauss); GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss); D_scalar=alpha2*gauss->weight*Jdet; @@ -3076,10 +3076,10 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorDiagnosticMacAyeal {{{*/ -ElementVector* Tria::CreatePVectorDiagnosticMacAyeal(){ +/*FUNCTION Tria::CreatePVectorDiagnosticSSA {{{*/ +ElementVector* Tria::CreatePVectorDiagnosticSSA(){ /*compute all load vectors for this element*/ - ElementVector* pe1=CreatePVectorDiagnosticMacAyealDrivingStress(); - ElementVector* pe2=CreatePVectorDiagnosticMacAyealFront(); + ElementVector* pe1=CreatePVectorDiagnosticSSADrivingStress(); + ElementVector* pe2=CreatePVectorDiagnosticSSAFront(); ElementVector* pe =new ElementVector(pe1,pe2); @@ -3090,6 +3090,6 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorDiagnosticMacAyealDrivingStress {{{*/ -ElementVector* Tria::CreatePVectorDiagnosticMacAyealDrivingStress(){ +/*FUNCTION Tria::CreatePVectorDiagnosticSSADrivingStress {{{*/ +ElementVector* Tria::CreatePVectorDiagnosticSSADrivingStress(){ /*Intermediaries */ @@ -3106,5 +3106,5 @@ /*Initialize Element vector and vectors*/ - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,MacAyealApproximationEnum); + ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,SSAApproximationEnum); GaussTria* gauss = new GaussTria(2); IssmDouble* basis = xNew(numnodes); @@ -3146,6 +3146,6 @@ } /*}}}*/ -/*FUNCTION Tria::CreatePVectorDiagnosticMacAyealFront {{{*/ -ElementVector* Tria::CreatePVectorDiagnosticMacAyealFront(){ +/*FUNCTION Tria::CreatePVectorDiagnosticSSAFront {{{*/ +ElementVector* Tria::CreatePVectorDiagnosticSSAFront(){ /*Intermediaries */ @@ -3181,5 +3181,5 @@ GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); - ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,MacAyealApproximationEnum); + ElementVector* pe=new ElementVector(nodes,numnodes,this->parameters,SSAApproximationEnum); Input* thickness_input=inputs->GetInput(ThicknessEnum); _assert_(thickness_input); Input* bed_input =inputs->GetInput(BedEnum); _assert_(bed_input); @@ -3293,5 +3293,5 @@ /*Initialize Element matrix, vectors and Gaussian points*/ - ElementMatrix* Ke=CreateKMatrixDiagnosticMacAyeal(); //Initialize Jacobian with regular MacAyeal (first part of the Gateau derivative) + ElementMatrix* Ke=CreateKMatrixDiagnosticSSA(); //Initialize Jacobian with regular SSA (first part of the Gateau derivative) IssmDouble* dbasis = xNew(2*numnodes); @@ -3730,11 +3730,11 @@ switch(control_type){ case FrictionCoefficientEnum: - GradjDragMacAyeal(gradient,control_index); + GradjDragSSA(gradient,control_index); break; case MaterialsRheologyBbarEnum: - GradjBMacAyeal(gradient,control_index); + GradjBSSA(gradient,control_index); break; case MaterialsRheologyZbarEnum: - GradjZMacAyeal(gradient,control_index); + GradjZSSA(gradient,control_index); break; case BalancethicknessThickeningRateEnum: @@ -3868,6 +3868,6 @@ } /*}}}*/ -/*FUNCTION Tria::GradjBMacAyeal{{{*/ -void Tria::GradjBMacAyeal(Vector* gradient,int control_index){ +/*FUNCTION Tria::GradjBSSA{{{*/ +void Tria::GradjBSSA(Vector* gradient,int control_index){ /*Intermediaries*/ @@ -3925,6 +3925,6 @@ } /*}}}*/ -/*FUNCTION Tria::GradjZMacAyeal{{{*/ -void Tria::GradjZMacAyeal(Vector* gradient,int control_index){ +/*FUNCTION Tria::GradjZSSA{{{*/ +void Tria::GradjZSSA(Vector* gradient,int control_index){ /*Intermediaries*/ @@ -3982,6 +3982,6 @@ } /*}}}*/ -/*FUNCTION Tria::GradjDragMacAyeal {{{*/ -void Tria::GradjDragMacAyeal(Vector* gradient,int control_index){ +/*FUNCTION Tria::GradjDragSSA {{{*/ +void Tria::GradjDragSSA(Vector* gradient,int control_index){ int i; @@ -5385,6 +5385,6 @@ } /*}}}*/ -/*FUNCTION Tria::CreateKMatrixAdjointMacAyeal{{{*/ -ElementMatrix* Tria::CreateKMatrixAdjointMacAyeal(void){ +/*FUNCTION Tria::CreateKMatrixAdjointSSA{{{*/ +ElementMatrix* Tria::CreateKMatrixAdjointSSA(void){ /*Constants*/ @@ -5404,7 +5404,7 @@ GaussTria *gauss=NULL; - /*Initialize Jacobian with regular MacAyeal (first part of the Gateau derivative)*/ + /*Initialize Jacobian with regular SSA (first part of the Gateau derivative)*/ parameters->FindParam(&incomplete_adjoint,InversionIncompleteAdjointEnum); - ElementMatrix* Ke=CreateKMatrixDiagnosticMacAyeal(); + ElementMatrix* Ke=CreateKMatrixDiagnosticSSA(); if(incomplete_adjoint) return Ke; @@ -6519,5 +6519,5 @@ } else if(stabilization==1){ - /*MacAyeal*/ + /*SSA*/ vxaverage_input->GetInputAverage(&vx); vyaverage_input->GetInputAverage(&vy); @@ -6978,5 +6978,5 @@ } else if(stabilization==2){ - /*MacAyeal*/ + /*SSA*/ vxaverage_input->GetInputAverage(&vx); vyaverage_input->GetInputAverage(&vy); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 15567) @@ -144,7 +144,7 @@ void GradjBGradient(Vector* gradient,int weight_index,int control_index); void GradjZGradient(Vector* gradient,int weight_index,int control_index); - void GradjBMacAyeal(Vector* gradient,int control_index); - void GradjZMacAyeal(Vector* gradient,int control_index); - void GradjDragMacAyeal(Vector* gradient,int control_index); + void GradjBSSA(Vector* gradient,int control_index); + void GradjZSSA(Vector* gradient,int control_index); + void GradjDragSSA(Vector* gradient,int control_index); void GradjDragFS(Vector* gradient,int control_index); void GradjDragGradient(Vector* gradient,int weight_index,int control_index); @@ -220,11 +220,11 @@ #ifdef _HAVE_DIAGNOSTIC_ - ElementMatrix* CreateKMatrixDiagnosticMacAyeal(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyealViscous(void); - ElementMatrix* CreateKMatrixDiagnosticMacAyealFriction(void); + ElementMatrix* CreateKMatrixDiagnosticSSA(void); + ElementMatrix* CreateKMatrixDiagnosticSSAViscous(void); + ElementMatrix* CreateKMatrixDiagnosticSSAFriction(void); ElementMatrix* CreateKMatrixDiagnosticSIA(void); - ElementVector* CreatePVectorDiagnosticMacAyeal(void); - ElementVector* CreatePVectorDiagnosticMacAyealDrivingStress(void); - ElementVector* CreatePVectorDiagnosticMacAyealFront(void); + ElementVector* CreatePVectorDiagnosticSSA(void); + ElementVector* CreatePVectorDiagnosticSSADrivingStress(void); + ElementVector* CreatePVectorDiagnosticSSAFront(void); ElementVector* CreatePVectorDiagnosticSIA(void); ElementMatrix* CreateJacobianDiagnosticSSA(void); @@ -237,5 +237,5 @@ #ifdef _HAVE_CONTROL_ ElementMatrix* CreateKMatrixAdjointBalancethickness(void); - ElementMatrix* CreateKMatrixAdjointMacAyeal(void); + ElementMatrix* CreateKMatrixAdjointSSA(void); ElementVector* CreatePVectorAdjointHoriz(void); ElementVector* CreatePVectorAdjointFS(void); Index: /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/TriaRef.cpp (revision 15567) @@ -80,6 +80,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBMacAyeal {{{*/ -void TriaRef::GetBMacAyeal(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TriaRef::GetBSSA {{{*/ +void TriaRef::GetBSSA(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. * For node i, Bi can be expressed in the actual coordinate system @@ -114,6 +114,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBMacAyealFS {{{*/ -void TriaRef::GetBMacAyealFS(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TriaRef::GetBSSAFS {{{*/ +void TriaRef::GetBSSAFS(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss){ /*Compute B matrix. B=[B1 B2 B3] where Bi is of size 3*NDOF2. @@ -230,6 +230,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBprimeMacAyeal {{{*/ -void TriaRef::GetBprimeMacAyeal(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TriaRef::GetBprimeSSA {{{*/ +void TriaRef::GetBprimeSSA(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ /*Compute B' matrix. B'=[B1' B2' B3'] where Bi' is of size 3*NDOF2. @@ -265,6 +265,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBprimeMacAyealFS {{{*/ -void TriaRef::GetBprimeMacAyealFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ +/*FUNCTION TriaRef::GetBprimeSSAFS {{{*/ +void TriaRef::GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss){ /*Compute Bprime matrix. Bprime=[Bprime1 Bprime2 Bprime3] where Bprimei is of size 3*NDOF2. * For node i, Bprimei can be expressed in the actual coordinate system @@ -331,6 +331,6 @@ } /*}}}*/ -/*FUNCTION TriaRef::GetBMacAyealFriction{{{*/ -void TriaRef::GetBMacAyealFriction(IssmDouble* B, IssmDouble* xyz_list,GaussTria* gauss){ +/*FUNCTION TriaRef::GetBSSAFriction{{{*/ +void TriaRef::GetBSSAFriction(IssmDouble* B, IssmDouble* xyz_list,GaussTria* gauss){ /*Compute B matrix. B=[B1 B2 B3] where Bi is square and of size 2. * For node i, Bi can be expressed in the actual coordinate system Index: /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Elements/TriaRef.h (revision 15567) @@ -23,12 +23,12 @@ /*Numerics*/ - void GetBMacAyeal(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); - void GetBMacAyealFS(IssmDouble* B , IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeMacAyeal(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); - void GetBprimeMacAyealFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); + void GetBSSA(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); + void GetBSSAFS(IssmDouble* B , IssmDouble* xyz_list, GaussTria* gauss); + void GetBprimeSSA(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); + void GetBprimeSSAFS(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); void GetBprimePrognostic(IssmDouble* Bprime, IssmDouble* xyz_list, GaussTria* gauss); void GetBPrognostic(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); void GetBHydro(IssmDouble* B, IssmDouble* xyz_list, GaussTria* gauss); - void GetBMacAyealFriction(IssmDouble* L, IssmDouble* xyz_list,GaussTria* gauss); + void GetBSSAFriction(IssmDouble* L, IssmDouble* xyz_list,GaussTria* gauss); void GetJacobian(IssmDouble* J, IssmDouble* xyz_list,GaussTria* gauss); void GetSegmentJacobianDeterminant(IssmDouble* Jdet, IssmDouble* xyz_list,GaussTria* gauss); Index: /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp (revision 15567) @@ -130,5 +130,5 @@ /*Get B matrix: */ - GetBMacAyeal(&B[0],xyz_list,gauss); + GetBSSA(&B[0],xyz_list,gauss); /*Here, we are computing the strain rate of (vx,0)*/ @@ -156,5 +156,5 @@ /*Get B matrix: */ - GetBMacAyeal(&B[0],xyz_list,gauss); + GetBSSA(&B[0],xyz_list,gauss); /*Here, we are computing the strain rate of (0,vy)*/ Index: /issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Loads/Icefront.cpp (revision 15567) @@ -65,5 +65,5 @@ icefront_mparid = iomodel->numberofelements+1; - if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){ + if (in_icefront_type==SSA2dIceFrontEnum || in_icefront_type==SSA3dIceFrontEnum){ numnodes = 2; numvertices = 2; @@ -152,5 +152,5 @@ // icefront_mparid=numberofelements+1; //matlab indexing // - if (in_icefront_type==MacAyeal2dIceFrontEnum || in_icefront_type==MacAyeal3dIceFrontEnum){ + if (in_icefront_type==SSA2dIceFrontEnum || in_icefront_type==SSA3dIceFrontEnum){ // icefront_node_ids[0]=iomodel->nodecounter+reCast(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+0)); // icefront_node_ids[1]=iomodel->nodecounter+reCast(*(iomodel->Data(DiagnosticIcefrontEnum)+segment_width*i+1)); @@ -375,6 +375,6 @@ switch(type){ - case MacAyeal2dIceFrontEnum: - case MacAyeal3dIceFrontEnum: + case SSA2dIceFrontEnum: + case SSA3dIceFrontEnum: for(int i=0;iSid(); return; @@ -397,8 +397,8 @@ switch(type){ - case MacAyeal2dIceFrontEnum: + case SSA2dIceFrontEnum: return NUMVERTICESSEG; #ifdef _HAVE_3D_ - case MacAyeal3dIceFrontEnum: + case SSA3dIceFrontEnum: return NUMVERTICESSEG; case HOIceFrontEnum: @@ -559,9 +559,9 @@ switch(type){ - case MacAyeal2dIceFrontEnum: - return CreatePVectorDiagnosticMacAyeal2d(); + case SSA2dIceFrontEnum: + return CreatePVectorDiagnosticSSA2d(); #ifdef _HAVE_3D_ - case MacAyeal3dIceFrontEnum: - return CreatePVectorDiagnosticMacAyeal3d(); + case SSA3dIceFrontEnum: + return CreatePVectorDiagnosticSSA3d(); case HOIceFrontEnum: return CreatePVectorDiagnosticHO(); @@ -574,6 +574,6 @@ } /*}}}*/ -/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal2d{{{*/ -ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal2d(void){ +/*FUNCTION Icefront::CreatePVectorDiagnosticSSA2d{{{*/ +ElementVector* Icefront::CreatePVectorDiagnosticSSA2d(void){ /*Intermediary*/ @@ -595,5 +595,5 @@ /*Initialize Element vector and vectors*/ - ElementVector* pe=new ElementVector(tria->nodes,numnodes,this->parameters,MacAyealApproximationEnum); + ElementVector* pe=new ElementVector(tria->nodes,numnodes,this->parameters,SSAApproximationEnum); IssmDouble* basis = xNew(numnodes); @@ -669,6 +669,6 @@ #endif #ifdef _HAVE_3D_ -/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{*/ -ElementVector* Icefront::CreatePVectorDiagnosticMacAyeal3d(void){ +/*FUNCTION Icefront::CreatePVectorDiagnosticSSA3d{{{*/ +ElementVector* Icefront::CreatePVectorDiagnosticSSA3d(void){ Icefront *icefront = NULL; @@ -682,10 +682,10 @@ if(!penta->IsOnBed() || penta->IsOnWater()) return NULL; - /*Spawn Tria and call MacAyeal2d*/ + /*Spawn Tria and call SSA2d*/ tria =(Tria*)penta->SpawnTria(0,1,2); icefront=(Icefront*)this->copy(); icefront->element=tria; - icefront->inputs->AddInput(new IntInput(IceFrontTypeEnum,MacAyeal2dIceFrontEnum)); - ElementVector* pe=icefront->CreatePVectorDiagnosticMacAyeal2d(); + icefront->inputs->AddInput(new IntInput(IceFrontTypeEnum,SSA2dIceFrontEnum)); + ElementVector* pe=icefront->CreatePVectorDiagnosticSSA2d(); /*clean-up and return*/ @@ -870,5 +870,5 @@ /*How many nodes? :*/ - if(type==MacAyeal2dIceFrontEnum || type==MacAyeal3dIceFrontEnum) + if(type==SSA2dIceFrontEnum || type==SSA3dIceFrontEnum) numberofnodes=2; else Index: /issm/trunk-jpl/src/c/classes/Loads/Icefront.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Icefront.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Loads/Icefront.h (revision 15567) @@ -93,8 +93,8 @@ #ifdef _HAVE_DIAGNOSTIC_ ElementVector* CreatePVectorDiagnosticHoriz(void); - ElementVector* CreatePVectorDiagnosticMacAyeal2d(void); + ElementVector* CreatePVectorDiagnosticSSA2d(void); #endif #ifdef _HAVE_3D_ - ElementVector* CreatePVectorDiagnosticMacAyeal3d(void); + ElementVector* CreatePVectorDiagnosticSSA3d(void); ElementVector* CreatePVectorDiagnosticHO(void); ElementVector* CreatePVectorDiagnosticFS(void); Index: /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Loads/Penpair.cpp (revision 15567) @@ -299,14 +299,14 @@ switch(approximation0){ - case MacAyealApproximationEnum: + case SSAApproximationEnum: switch(approximation1){ - case MacAyealApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealHO(kmax); - case HOApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealHO(kmax); + case SSAApproximationEnum: return PenaltyCreateKMatrixDiagnosticSSAHO(kmax); + case HOApproximationEnum: return PenaltyCreateKMatrixDiagnosticSSAHO(kmax); default: _error_("not supported yet"); } case HOApproximationEnum: switch(approximation1){ - case MacAyealApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealHO(kmax); - case HOApproximationEnum: return PenaltyCreateKMatrixDiagnosticMacAyealHO(kmax); + case SSAApproximationEnum: return PenaltyCreateKMatrixDiagnosticSSAHO(kmax); + case HOApproximationEnum: return PenaltyCreateKMatrixDiagnosticSSAHO(kmax); default: _error_("not supported yet"); } @@ -327,6 +327,6 @@ } /*}}}*/ -/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticMacAyealHO {{{*/ -ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticMacAyealHO(IssmDouble kmax){ +/*FUNCTION Penpair::PenaltyCreateKMatrixDiagnosticSSAHO {{{*/ +ElementMatrix* Penpair::PenaltyCreateKMatrixDiagnosticSSAHO(IssmDouble kmax){ const int numdof=NUMVERTICES*NDOF2; Index: /issm/trunk-jpl/src/c/classes/Loads/Penpair.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Penpair.h (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Loads/Penpair.h (revision 15567) @@ -68,5 +68,5 @@ /*Penpair management: {{{*/ ElementMatrix* PenaltyCreateKMatrixDiagnosticHoriz(IssmDouble kmax); - ElementMatrix* PenaltyCreateKMatrixDiagnosticMacAyealHO(IssmDouble kmax); + ElementMatrix* PenaltyCreateKMatrixDiagnosticSSAHO(IssmDouble kmax); ElementMatrix* PenaltyCreateKMatrixDiagnosticFS(IssmDouble kmax); ElementMatrix* PenaltyCreateKMatrixPrognostic(IssmDouble kmax); Index: /issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Materials/Matdamageice.cpp (revision 15567) @@ -282,5 +282,5 @@ void Matdamageice::GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * B @@ -353,5 +353,5 @@ /*FUNCTION Matdamageice::GetViscosity3dFS {{{*/ void Matdamageice::GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * B @@ -426,5 +426,5 @@ /*FUNCTION Matdamageice::GetViscosityComplement {{{*/ void Matdamageice::GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * 1 Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 15567) @@ -274,5 +274,5 @@ void Matice::GetViscosity3d(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * B @@ -344,5 +344,5 @@ /*FUNCTION Matice::GetViscosity3dFS {{{*/ void Matice::GetViscosity3dFS(IssmDouble* pviscosity3d, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * B @@ -416,5 +416,5 @@ /*FUNCTION Matice::GetViscosityComplement {{{*/ void Matice::GetViscosityComplement(IssmDouble* pviscosity_complement, IssmDouble* epsilon){ - /*Return viscosity accounting for steady state power law creep [Thomas and MacAyeal, 1982]: + /*Return viscosity accounting for steady state power law creep [Thomas and SSA, 1982]: * * 1 Index: /issm/trunk-jpl/src/c/classes/Node.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Node.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/classes/Node.cpp (revision 15567) @@ -77,5 +77,5 @@ _assert_(iomodel->Data(MeshVertexonbedEnum)); _assert_(iomodel->Data(FlowequationVertexEquationEnum)); - if(node_type==MacAyealApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ + if(node_type==SSAApproximationEnum && !reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ this->Deactivate(); } @@ -83,10 +83,10 @@ this->Deactivate(); } - if(node_type==MacAyealHOApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ + if(node_type==SSAHOApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ this->Deactivate(); } } - if(node_type==MacAyealFSApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ + if(node_type==SSAFSApproximationEnum && reCast(iomodel->Data(FlowequationBorderSSAEnum)[io_index])){ if(!reCast(iomodel->Data(MeshVertexonbedEnum)[io_index])){ for(k=1;k<=2;k++) this->FreezeDof(k); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp (revision 15567) @@ -100,5 +100,5 @@ /*Start with adding spcs of coupling: zero at the border SSA/HO for the appropriate dofs*/ - if (reCast(vertices_type[i]==MacAyealHOApproximationEnum)){ + if (reCast(vertices_type[i]==SSAHOApproximationEnum)){ /*If grionSSA, spc HO dofs: 3 & 4*/ if (reCast(nodeonHO[i])){ @@ -132,5 +132,5 @@ } - else _error_("if vertices_type is MacAyealHO, you shoud have nodeonHO or nodeonSSA"); + else _error_("if vertices_type is SSAHO, you shoud have nodeonHO or nodeonSSA"); } /*Also add spcs of coupling: zero at the border HO/FS for the appropriate dofs*/ @@ -175,5 +175,5 @@ } /*Also add spcs of coupling: zero at the border HO/FS for the appropriate dofs*/ - else if (reCast(vertices_type[i])==MacAyealFSApproximationEnum){ + else if (reCast(vertices_type[i])==SSAFSApproximationEnum){ /*If grion,HO spc FS dofs: 3 4 & 5*/ if (reCast(nodeonSSA[i])){ @@ -212,5 +212,5 @@ } } - else _error_("if vertices_type is MacAyealFS, you shoud have nodeonSSA or nodeonFS"); + else _error_("if vertices_type is SSAFS, you shoud have nodeonSSA or nodeonFS"); } /*Now add the regular spcs*/ @@ -294,5 +294,5 @@ if (iomodel->dim==3) if(reCast(nodeonbed[i]) && reCast(nodeonicesheet[i]) && reCast(nodeonFS[i])){ switch(reCast(vertices_type[i])){ - case MacAyealFSApproximationEnum: + case SSAFSApproximationEnum: constraints->AddObject(new SpcStatic(iomodel->constraintcounter+count+1,iomodel->nodecounter+i+1,5,0.,DiagnosticHorizAnalysisEnum)); count++; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 15567) @@ -18,5 +18,5 @@ case DiagnosticHorizAnalysisEnum: switch(node_type){ - case MacAyealApproximationEnum: + case SSAApproximationEnum: numdofs=2; break; @@ -36,9 +36,9 @@ numdofs=4; break; - case MacAyealHOApproximationEnum: + case SSAHOApproximationEnum: numdofs=4; doftype=xNew(numdofs); - doftype[0]=MacAyealApproximationEnum; - doftype[1]=MacAyealApproximationEnum; + doftype[0]=SSAApproximationEnum; + doftype[1]=SSAApproximationEnum; doftype[2]=HOApproximationEnum; doftype[3]=HOApproximationEnum; @@ -54,9 +54,9 @@ doftype[5]=FSApproximationEnum; break; - case MacAyealFSApproximationEnum: + case SSAFSApproximationEnum: numdofs=6; doftype=xNew(numdofs); - doftype[0]=MacAyealApproximationEnum; - doftype[1]=MacAyealApproximationEnum; + doftype[0]=SSAApproximationEnum; + doftype[1]=SSAApproximationEnum; doftype[2]=FSApproximationEnum; doftype[3]=FSApproximationEnum; Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15566) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15567) @@ -311,7 +311,7 @@ NoneApproximationEnum, SIAApproximationEnum, - MacAyealApproximationEnum, - MacAyealHOApproximationEnum, - MacAyealFSApproximationEnum, + SSAApproximationEnum, + SSAHOApproximationEnum, + SSAFSApproximationEnum, L1L2ApproximationEnum, HOApproximationEnum, @@ -356,6 +356,6 @@ TransientParamEnum, IceFrontTypeEnum, - MacAyeal2dIceFrontEnum, - MacAyeal3dIceFrontEnum, + SSA2dIceFrontEnum, + SSA3dIceFrontEnum, MaticeEnum, MatdamageiceEnum, @@ -460,5 +460,5 @@ VyPicardEnum, VzEnum, - VzMacAyealEnum, + VzSSAEnum, VzHOEnum, VzPicardEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15567) @@ -315,7 +315,7 @@ case NoneApproximationEnum : return "NoneApproximation"; case SIAApproximationEnum : return "SIAApproximation"; - case MacAyealApproximationEnum : return "MacAyealApproximation"; - case MacAyealHOApproximationEnum : return "MacAyealHOApproximation"; - case MacAyealFSApproximationEnum : return "MacAyealFSApproximation"; + case SSAApproximationEnum : return "SSAApproximation"; + case SSAHOApproximationEnum : return "SSAHOApproximation"; + case SSAFSApproximationEnum : return "SSAFSApproximation"; case L1L2ApproximationEnum : return "L1L2Approximation"; case HOApproximationEnum : return "HOApproximation"; @@ -356,6 +356,6 @@ case TransientParamEnum : return "TransientParam"; case IceFrontTypeEnum : return "IceFrontType"; - case MacAyeal2dIceFrontEnum : return "MacAyeal2dIceFront"; - case MacAyeal3dIceFrontEnum : return "MacAyeal3dIceFront"; + case SSA2dIceFrontEnum : return "SSA2dIceFront"; + case SSA3dIceFrontEnum : return "SSA3dIceFront"; case MaticeEnum : return "Matice"; case MatdamageiceEnum : return "Matdamageice"; @@ -454,5 +454,5 @@ case VyPicardEnum : return "VyPicard"; case VzEnum : return "Vz"; - case VzMacAyealEnum : return "VzMacAyeal"; + case VzSSAEnum : return "VzSSA"; case VzHOEnum : return "VzHO"; case VzPicardEnum : return "VzPicard"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15566) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15567) @@ -321,7 +321,7 @@ else if (strcmp(name,"NoneApproximation")==0) return NoneApproximationEnum; else if (strcmp(name,"SIAApproximation")==0) return SIAApproximationEnum; - else if (strcmp(name,"MacAyealApproximation")==0) return MacAyealApproximationEnum; - else if (strcmp(name,"MacAyealHOApproximation")==0) return MacAyealHOApproximationEnum; - else if (strcmp(name,"MacAyealFSApproximation")==0) return MacAyealFSApproximationEnum; + else if (strcmp(name,"SSAApproximation")==0) return SSAApproximationEnum; + else if (strcmp(name,"SSAHOApproximation")==0) return SSAHOApproximationEnum; + else if (strcmp(name,"SSAFSApproximation")==0) return SSAFSApproximationEnum; else if (strcmp(name,"L1L2Approximation")==0) return L1L2ApproximationEnum; else if (strcmp(name,"HOApproximation")==0) return HOApproximationEnum; @@ -362,6 +362,6 @@ else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; else if (strcmp(name,"IceFrontType")==0) return IceFrontTypeEnum; - else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; - else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; + else if (strcmp(name,"SSA2dIceFront")==0) return SSA2dIceFrontEnum; + else if (strcmp(name,"SSA3dIceFront")==0) return SSA3dIceFrontEnum; else if (strcmp(name,"Matice")==0) return MaticeEnum; else if (strcmp(name,"Matdamageice")==0) return MatdamageiceEnum; @@ -463,5 +463,5 @@ else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; else if (strcmp(name,"Vz")==0) return VzEnum; - else if (strcmp(name,"VzMacAyeal")==0) return VzMacAyealEnum; + else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; else if (strcmp(name,"VzHO")==0) return VzHOEnum; else if (strcmp(name,"VzPicard")==0) return VzPicardEnum; Index: /issm/trunk-jpl/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 15566) +++ /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 15567) @@ -38,5 +38,5 @@ fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]'); fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]'); - fielddisplay(obj,'stabilization','0: None, 1: SU, 2: MacAyeal''s artificial diffusivity, 3:DG'); + fielddisplay(obj,'stabilization','0: None, 1: SU, 2: SSA''s artificial diffusivity, 3:DG'); end % }}} Index: /issm/trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 15566) +++ /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 15567) @@ -27,5 +27,5 @@ string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]')) string="%s\n%s"%(string,fielddisplay(self,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]')) - string="%s\n%s"%(string,fielddisplay(self,'stabilization',"0: None, 1: SU, 2: MacAyeal's artificial diffusivity, 3:DG")) + string="%s\n%s"%(string,fielddisplay(self,'stabilization',"0: None, 1: SU, 2: SSA's artificial diffusivity, 3:DG")) return string #}}} Index: /issm/trunk-jpl/src/m/classes/flowequation.m =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.m (revision 15566) +++ /issm/trunk-jpl/src/m/classes/flowequation.m (revision 15567) @@ -132,9 +132,9 @@ pos=find(data==0); data(pos,end)=NoneApproximationEnum(); pos=find(data==1); data(pos,end)=SIAApproximationEnum(); - pos=find(data==2); data(pos,end)=MacAyealApproximationEnum(); + pos=find(data==2); data(pos,end)=SSAApproximationEnum(); pos=find(data==3); data(pos,end)=HOApproximationEnum(); pos=find(data==4); data(pos,end)=FSApproximationEnum(); - pos=find(data==5); data(pos,end)=MacAyealHOApproximationEnum(); - pos=find(data==6); data(pos,end)=MacAyealFSApproximationEnum(); + pos=find(data==5); data(pos,end)=SSAHOApproximationEnum(); + pos=find(data==6); data(pos,end)=SSAFSApproximationEnum(); pos=find(data==7); data(pos,end)=HOFSApproximationEnum(); pos=find(data==8); data(pos,end)=L1L2ApproximationEnum(); @@ -143,9 +143,9 @@ pos=find(data==0); data(pos,end)=NoneApproximationEnum(); pos=find(data==1); data(pos,end)=SIAApproximationEnum(); - pos=find(data==2); data(pos,end)=MacAyealApproximationEnum(); + pos=find(data==2); data(pos,end)=SSAApproximationEnum(); pos=find(data==3); data(pos,end)=HOApproximationEnum(); pos=find(data==4); data(pos,end)=FSApproximationEnum(); - pos=find(data==5); data(pos,end)=MacAyealHOApproximationEnum(); - pos=find(data==6); data(pos,end)=MacAyealFSApproximationEnum(); + pos=find(data==5); data(pos,end)=SSAHOApproximationEnum(); + pos=find(data==6); data(pos,end)=SSAFSApproximationEnum(); pos=find(data==7); data(pos,end)=HOFSApproximationEnum(); pos=find(data==8); data(pos,end)=L1L2ApproximationEnum(); Index: /issm/trunk-jpl/src/m/classes/flowequation.py =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.py (revision 15566) +++ /issm/trunk-jpl/src/m/classes/flowequation.py (revision 15567) @@ -94,9 +94,9 @@ data[numpy.nonzero(data==0)]=NoneApproximationEnum() data[numpy.nonzero(data==1)]=SIAApproximationEnum() - data[numpy.nonzero(data==2)]=MacAyealApproximationEnum() + data[numpy.nonzero(data==2)]=SSAApproximationEnum() data[numpy.nonzero(data==3)]=HOApproximationEnum() data[numpy.nonzero(data==4)]=FSApproximationEnum() - data[numpy.nonzero(data==5)]=MacAyealHOApproximationEnum() - data[numpy.nonzero(data==6)]=MacAyealFSApproximationEnum() + data[numpy.nonzero(data==5)]=SSAHOApproximationEnum() + data[numpy.nonzero(data==6)]=SSAFSApproximationEnum() data[numpy.nonzero(data==7)]=HOFSApproximationEnum() data[numpy.nonzero(data==8)]=L1L2ApproximationEnum() @@ -105,9 +105,9 @@ data[numpy.nonzero(data==0)]=NoneApproximationEnum() data[numpy.nonzero(data==1)]=SIAApproximationEnum() - data[numpy.nonzero(data==2)]=MacAyealApproximationEnum() + data[numpy.nonzero(data==2)]=SSAApproximationEnum() data[numpy.nonzero(data==3)]=HOApproximationEnum() data[numpy.nonzero(data==4)]=FSApproximationEnum() - data[numpy.nonzero(data==5)]=MacAyealHOApproximationEnum() - data[numpy.nonzero(data==6)]=MacAyealFSApproximationEnum() + data[numpy.nonzero(data==5)]=SSAHOApproximationEnum() + data[numpy.nonzero(data==6)]=SSAFSApproximationEnum() data[numpy.nonzero(data==7)]=HOFSApproximationEnum() data[numpy.nonzero(data==8)]=L1L2ApproximationEnum() Index: /issm/trunk-jpl/src/m/enum/DiagnosticFSreconditioningEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DiagnosticFSreconditioningEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/DiagnosticFSreconditioningEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=DiagnosticFSreconditioningEnum() +%DIAGNOSTICFSRECONDITIONINGENUM - Enum of DiagnosticFSreconditioning +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=DiagnosticFSreconditioningEnum() + +macro=StringToEnum('DiagnosticFSreconditioning'); Index: sm/trunk-jpl/src/m/enum/DiagnosticHutterAnalysisEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DiagnosticHutterAnalysisEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=DiagnosticHutterAnalysisEnum() -%DIAGNOSTICHUTTERANALYSISENUM - Enum of DiagnosticHutterAnalysis -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=DiagnosticHutterAnalysisEnum() - -macro=StringToEnum('DiagnosticHutterAnalysis'); Index: /issm/trunk-jpl/src/m/enum/DiagnosticSIAAnalysisEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DiagnosticSIAAnalysisEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/DiagnosticSIAAnalysisEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=DiagnosticSIAAnalysisEnum() +%DIAGNOSTICSIAANALYSISENUM - Enum of DiagnosticSIAAnalysis +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=DiagnosticSIAAnalysisEnum() + +macro=StringToEnum('DiagnosticSIAAnalysis'); Index: sm/trunk-jpl/src/m/enum/DiagnosticStokesreconditioningEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/DiagnosticStokesreconditioningEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=DiagnosticStokesreconditioningEnum() -%DIAGNOSTICSTOKESRECONDITIONINGENUM - Enum of DiagnosticStokesreconditioning -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=DiagnosticStokesreconditioningEnum() - -macro=StringToEnum('DiagnosticStokesreconditioning'); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15566) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 15567) @@ -4181,45 +4181,45 @@ return StringToEnum('SIAApproximation')[0] -def MacAyealApproximationEnum(): - """ - MACAYEALAPPROXIMATIONENUM - Enum of MacAyealApproximation - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=MacAyealApproximationEnum() - """ - - return StringToEnum('MacAyealApproximation')[0] - -def MacAyealHOApproximationEnum(): - """ - MACAYEALHOAPPROXIMATIONENUM - Enum of MacAyealHOApproximation - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=MacAyealHOApproximationEnum() - """ - - return StringToEnum('MacAyealHOApproximation')[0] - -def MacAyealFSApproximationEnum(): - """ - MACAYEALFSAPPROXIMATIONENUM - Enum of MacAyealFSApproximation - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=MacAyealFSApproximationEnum() - """ - - return StringToEnum('MacAyealFSApproximation')[0] +def SSAApproximationEnum(): + """ + SSAAPPROXIMATIONENUM - Enum of SSAApproximation + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=SSAApproximationEnum() + """ + + return StringToEnum('SSAApproximation')[0] + +def SSAHOApproximationEnum(): + """ + SSAHOAPPROXIMATIONENUM - Enum of SSAHOApproximation + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=SSAHOApproximationEnum() + """ + + return StringToEnum('SSAHOApproximation')[0] + +def SSAFSApproximationEnum(): + """ + SSAFSAPPROXIMATIONENUM - Enum of SSAFSApproximation + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=SSAFSApproximationEnum() + """ + + return StringToEnum('SSAFSApproximation')[0] def L1L2ApproximationEnum(): @@ -4755,31 +4755,31 @@ return StringToEnum('IceFrontType')[0] -def MacAyeal2dIceFrontEnum(): - """ - MACAYEAL2DICEFRONTENUM - Enum of MacAyeal2dIceFront - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=MacAyeal2dIceFrontEnum() - """ - - return StringToEnum('MacAyeal2dIceFront')[0] - -def MacAyeal3dIceFrontEnum(): - """ - MACAYEAL3DICEFRONTENUM - Enum of MacAyeal3dIceFront - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=MacAyeal3dIceFrontEnum() - """ - - return StringToEnum('MacAyeal3dIceFront')[0] +def SSA2dIceFrontEnum(): + """ + SSA2DICEFRONTENUM - Enum of SSA2dIceFront + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=SSA2dIceFrontEnum() + """ + + return StringToEnum('SSA2dIceFront')[0] + +def SSA3dIceFrontEnum(): + """ + SSA3DICEFRONTENUM - Enum of SSA3dIceFront + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=SSA3dIceFrontEnum() + """ + + return StringToEnum('SSA3dIceFront')[0] def MaticeEnum(): @@ -6127,17 +6127,17 @@ return StringToEnum('Vz')[0] -def VzMacAyealEnum(): - """ - VZMACAYEALENUM - Enum of VzMacAyeal - - WARNING: DO NOT MODIFY THIS FILE - this file has been automatically generated by src/c/shared/Enum/Synchronize.sh - Please read src/c/shared/Enum/README for more information - - Usage: - macro=VzMacAyealEnum() - """ - - return StringToEnum('VzMacAyeal')[0] +def VzSSAEnum(): + """ + VZSSAENUM - Enum of VzSSA + + WARNING: DO NOT MODIFY THIS FILE + this file has been automatically generated by src/c/shared/Enum/Synchronize.sh + Please read src/c/shared/Enum/README for more information + + Usage: + macro=VzSSAEnum() + """ + + return StringToEnum('VzSSA')[0] def VzHOEnum(): Index: /issm/trunk-jpl/src/m/enum/FSApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FSApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FSApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FSApproximationEnum() +%FSAPPROXIMATIONENUM - Enum of FSApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FSApproximationEnum() + +macro=StringToEnum('FSApproximation'); Index: /issm/trunk-jpl/src/m/enum/FSIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FSIceFrontEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FSIceFrontEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FSIceFrontEnum() +%FSICEFRONTENUM - Enum of FSIceFront +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FSIceFrontEnum() + +macro=StringToEnum('FSIceFront'); Index: /issm/trunk-jpl/src/m/enum/FSSolverEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FSSolverEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FSSolverEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FSSolverEnum() +%FSSOLVERENUM - Enum of FSSolver +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FSSolverEnum() + +macro=StringToEnum('FSSolver'); Index: /issm/trunk-jpl/src/m/enum/FlowequationBorderFSEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBorderFSEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationBorderFSEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationBorderFSEnum() +%FLOWEQUATIONBORDERFSENUM - Enum of FlowequationBorderFS +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationBorderFSEnum() + +macro=StringToEnum('FlowequationBorderFS'); Index: /issm/trunk-jpl/src/m/enum/FlowequationBorderHOEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBorderHOEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationBorderHOEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationBorderHOEnum() +%FLOWEQUATIONBORDERHOENUM - Enum of FlowequationBorderHO +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationBorderHOEnum() + +macro=StringToEnum('FlowequationBorderHO'); Index: /issm/trunk-jpl/src/m/enum/FlowequationBorderSSAEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBorderSSAEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationBorderSSAEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationBorderSSAEnum() +%FLOWEQUATIONBORDERSSAENUM - Enum of FlowequationBorderSSA +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationBorderSSAEnum() + +macro=StringToEnum('FlowequationBorderSSA'); Index: sm/trunk-jpl/src/m/enum/FlowequationBordermacayealEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBordermacayealEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationBordermacayealEnum() -%FLOWEQUATIONBORDERMACAYEALENUM - Enum of FlowequationBordermacayeal -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationBordermacayealEnum() - -macro=StringToEnum('FlowequationBordermacayeal'); Index: sm/trunk-jpl/src/m/enum/FlowequationBorderpattynEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBorderpattynEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationBorderpattynEnum() -%FLOWEQUATIONBORDERPATTYNENUM - Enum of FlowequationBorderpattyn -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationBorderpattynEnum() - -macro=StringToEnum('FlowequationBorderpattyn'); Index: sm/trunk-jpl/src/m/enum/FlowequationBorderstokesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationBorderstokesEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationBorderstokesEnum() -%FLOWEQUATIONBORDERSTOKESENUM - Enum of FlowequationBorderstokes -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationBorderstokesEnum() - -macro=StringToEnum('FlowequationBorderstokes'); Index: /issm/trunk-jpl/src/m/enum/FlowequationFeFSEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationFeFSEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationFeFSEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationFeFSEnum() +%FLOWEQUATIONFEFSENUM - Enum of FlowequationFeFS +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationFeFSEnum() + +macro=StringToEnum('FlowequationFeFS'); Index: /issm/trunk-jpl/src/m/enum/FlowequationFeSSAEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationFeSSAEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationFeSSAEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationFeSSAEnum() +%FLOWEQUATIONFESSAENUM - Enum of FlowequationFeSSA +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationFeSSAEnum() + +macro=StringToEnum('FlowequationFeSSA'); Index: sm/trunk-jpl/src/m/enum/FlowequationFeSsaEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationFeSsaEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationFeSsaEnum() -%FLOWEQUATIONFESSAENUM - Enum of FlowequationFeSsa -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationFeSsaEnum() - -macro=StringToEnum('FlowequationFeSsa'); Index: sm/trunk-jpl/src/m/enum/FlowequationFeStokesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationFeStokesEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationFeStokesEnum() -%FLOWEQUATIONFESTOKESENUM - Enum of FlowequationFeStokes -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationFeStokesEnum() - -macro=StringToEnum('FlowequationFeStokes'); Index: /issm/trunk-jpl/src/m/enum/FlowequationIsFSEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsFSEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationIsFSEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationIsFSEnum() +%FLOWEQUATIONISFSENUM - Enum of FlowequationIsFS +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationIsFSEnum() + +macro=StringToEnum('FlowequationIsFS'); Index: /issm/trunk-jpl/src/m/enum/FlowequationIsHOEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsHOEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationIsHOEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationIsHOEnum() +%FLOWEQUATIONISHOENUM - Enum of FlowequationIsHO +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationIsHOEnum() + +macro=StringToEnum('FlowequationIsHO'); Index: /issm/trunk-jpl/src/m/enum/FlowequationIsL1L2Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsL1L2Enum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationIsL1L2Enum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationIsL1L2Enum() +%FLOWEQUATIONISL1L2ENUM - Enum of FlowequationIsL1L2 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationIsL1L2Enum() + +macro=StringToEnum('FlowequationIsL1L2'); Index: /issm/trunk-jpl/src/m/enum/FlowequationIsSIAEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsSIAEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationIsSIAEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationIsSIAEnum() +%FLOWEQUATIONISSIAENUM - Enum of FlowequationIsSIA +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationIsSIAEnum() + +macro=StringToEnum('FlowequationIsSIA'); Index: /issm/trunk-jpl/src/m/enum/FlowequationIsSSAEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsSSAEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/FlowequationIsSSAEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=FlowequationIsSSAEnum() +%FLOWEQUATIONISSSAENUM - Enum of FlowequationIsSSA +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=FlowequationIsSSAEnum() + +macro=StringToEnum('FlowequationIsSSA'); Index: sm/trunk-jpl/src/m/enum/FlowequationIshutterEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIshutterEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationIshutterEnum() -%FLOWEQUATIONISHUTTERENUM - Enum of FlowequationIshutter -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationIshutterEnum() - -macro=StringToEnum('FlowequationIshutter'); Index: sm/trunk-jpl/src/m/enum/FlowequationIsl1l2Enum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsl1l2Enum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationIsl1l2Enum() -%FLOWEQUATIONISL1L2ENUM - Enum of FlowequationIsl1l2 -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationIsl1l2Enum() - -macro=StringToEnum('FlowequationIsl1l2'); Index: sm/trunk-jpl/src/m/enum/FlowequationIsmacayealEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsmacayealEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationIsmacayealEnum() -%FLOWEQUATIONISMACAYEALENUM - Enum of FlowequationIsmacayeal -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationIsmacayealEnum() - -macro=StringToEnum('FlowequationIsmacayeal'); Index: sm/trunk-jpl/src/m/enum/FlowequationIspattynEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIspattynEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationIspattynEnum() -%FLOWEQUATIONISPATTYNENUM - Enum of FlowequationIspattyn -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationIspattynEnum() - -macro=StringToEnum('FlowequationIspattyn'); Index: sm/trunk-jpl/src/m/enum/FlowequationIsstokesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/FlowequationIsstokesEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=FlowequationIsstokesEnum() -%FLOWEQUATIONISSTOKESENUM - Enum of FlowequationIsstokes -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=FlowequationIsstokesEnum() - -macro=StringToEnum('FlowequationIsstokes'); Index: /issm/trunk-jpl/src/m/enum/HOApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HOApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/HOApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=HOApproximationEnum() +%HOAPPROXIMATIONENUM - Enum of HOApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=HOApproximationEnum() + +macro=StringToEnum('HOApproximation'); Index: /issm/trunk-jpl/src/m/enum/HOFSApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HOFSApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/HOFSApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=HOFSApproximationEnum() +%HOFSAPPROXIMATIONENUM - Enum of HOFSApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=HOFSApproximationEnum() + +macro=StringToEnum('HOFSApproximation'); Index: /issm/trunk-jpl/src/m/enum/HOIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HOIceFrontEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/HOIceFrontEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=HOIceFrontEnum() +%HOICEFRONTENUM - Enum of HOIceFront +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=HOIceFrontEnum() + +macro=StringToEnum('HOIceFront'); Index: sm/trunk-jpl/src/m/enum/HutterApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HutterApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HutterApproximationEnum() -%HUTTERAPPROXIMATIONENUM - Enum of HutterApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=HutterApproximationEnum() - -macro=StringToEnum('HutterApproximation'); Index: sm/trunk-jpl/src/m/enum/MacAyeal2dIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MacAyeal2dIceFrontEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MacAyeal2dIceFrontEnum() -%MACAYEAL2DICEFRONTENUM - Enum of MacAyeal2dIceFront -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MacAyeal2dIceFrontEnum() - -macro=StringToEnum('MacAyeal2dIceFront'); Index: sm/trunk-jpl/src/m/enum/MacAyeal3dIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MacAyeal3dIceFrontEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MacAyeal3dIceFrontEnum() -%MACAYEAL3DICEFRONTENUM - Enum of MacAyeal3dIceFront -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MacAyeal3dIceFrontEnum() - -macro=StringToEnum('MacAyeal3dIceFront'); Index: sm/trunk-jpl/src/m/enum/MacAyealApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MacAyealApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MacAyealApproximationEnum() -%MACAYEALAPPROXIMATIONENUM - Enum of MacAyealApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MacAyealApproximationEnum() - -macro=StringToEnum('MacAyealApproximation'); Index: sm/trunk-jpl/src/m/enum/MacAyealPattynApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MacAyealPattynApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MacAyealPattynApproximationEnum() -%MACAYEALPATTYNAPPROXIMATIONENUM - Enum of MacAyealPattynApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MacAyealPattynApproximationEnum() - -macro=StringToEnum('MacAyealPattynApproximation'); Index: sm/trunk-jpl/src/m/enum/MacAyealStokesApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MacAyealStokesApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=MacAyealStokesApproximationEnum() -%MACAYEALSTOKESAPPROXIMATIONENUM - Enum of MacAyealStokesApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=MacAyealStokesApproximationEnum() - -macro=StringToEnum('MacAyealStokesApproximation'); Index: sm/trunk-jpl/src/m/enum/PattynApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/PattynApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=PattynApproximationEnum() -%PATTYNAPPROXIMATIONENUM - Enum of PattynApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=PattynApproximationEnum() - -macro=StringToEnum('PattynApproximation'); Index: sm/trunk-jpl/src/m/enum/PattynIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/PattynIceFrontEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=PattynIceFrontEnum() -%PATTYNICEFRONTENUM - Enum of PattynIceFront -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=PattynIceFrontEnum() - -macro=StringToEnum('PattynIceFront'); Index: sm/trunk-jpl/src/m/enum/PattynStokesApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/PattynStokesApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=PattynStokesApproximationEnum() -%PATTYNSTOKESAPPROXIMATIONENUM - Enum of PattynStokesApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=PattynStokesApproximationEnum() - -macro=StringToEnum('PattynStokesApproximation'); Index: /issm/trunk-jpl/src/m/enum/SIAApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SIAApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SIAApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SIAApproximationEnum() +%SIAAPPROXIMATIONENUM - Enum of SIAApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SIAApproximationEnum() + +macro=StringToEnum('SIAApproximation'); Index: /issm/trunk-jpl/src/m/enum/SSA2dIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SSA2dIceFrontEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SSA2dIceFrontEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SSA2dIceFrontEnum() +%SSA2DICEFRONTENUM - Enum of SSA2dIceFront +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SSA2dIceFrontEnum() + +macro=StringToEnum('SSA2dIceFront'); Index: /issm/trunk-jpl/src/m/enum/SSA3dIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SSA3dIceFrontEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SSA3dIceFrontEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SSA3dIceFrontEnum() +%SSA3DICEFRONTENUM - Enum of SSA3dIceFront +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SSA3dIceFrontEnum() + +macro=StringToEnum('SSA3dIceFront'); Index: /issm/trunk-jpl/src/m/enum/SSAApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SSAApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SSAApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SSAApproximationEnum() +%SSAAPPROXIMATIONENUM - Enum of SSAApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SSAApproximationEnum() + +macro=StringToEnum('SSAApproximation'); Index: /issm/trunk-jpl/src/m/enum/SSAFSApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SSAFSApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SSAFSApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SSAFSApproximationEnum() +%SSAFSAPPROXIMATIONENUM - Enum of SSAFSApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SSAFSApproximationEnum() + +macro=StringToEnum('SSAFSApproximation'); Index: /issm/trunk-jpl/src/m/enum/SSAHOApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/SSAHOApproximationEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/SSAHOApproximationEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=SSAHOApproximationEnum() +%SSAHOAPPROXIMATIONENUM - Enum of SSAHOApproximation +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=SSAHOApproximationEnum() + +macro=StringToEnum('SSAHOApproximation'); Index: sm/trunk-jpl/src/m/enum/StokesApproximationEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/StokesApproximationEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=StokesApproximationEnum() -%STOKESAPPROXIMATIONENUM - Enum of StokesApproximation -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=StokesApproximationEnum() - -macro=StringToEnum('StokesApproximation'); Index: sm/trunk-jpl/src/m/enum/StokesIceFrontEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/StokesIceFrontEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=StokesIceFrontEnum() -%STOKESICEFRONTENUM - Enum of StokesIceFront -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=StokesIceFrontEnum() - -macro=StringToEnum('StokesIceFront'); Index: sm/trunk-jpl/src/m/enum/StokesSolverEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/StokesSolverEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=StokesSolverEnum() -%STOKESSOLVERENUM - Enum of StokesSolver -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=StokesSolverEnum() - -macro=StringToEnum('StokesSolver'); Index: /issm/trunk-jpl/src/m/enum/VzFSEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzFSEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/VzFSEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=VzFSEnum() +%VZFSENUM - Enum of VzFS +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=VzFSEnum() + +macro=StringToEnum('VzFS'); Index: /issm/trunk-jpl/src/m/enum/VzHOEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzHOEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/VzHOEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=VzHOEnum() +%VZHOENUM - Enum of VzHO +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=VzHOEnum() + +macro=StringToEnum('VzHO'); Index: sm/trunk-jpl/src/m/enum/VzMacAyealEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzMacAyealEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=VzMacAyealEnum() -%VZMACAYEALENUM - Enum of VzMacAyeal -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=VzMacAyealEnum() - -macro=StringToEnum('VzMacAyeal'); Index: sm/trunk-jpl/src/m/enum/VzPattynEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzPattynEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=VzPattynEnum() -%VZPATTYNENUM - Enum of VzPattyn -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=VzPattynEnum() - -macro=StringToEnum('VzPattyn'); Index: /issm/trunk-jpl/src/m/enum/VzSSAEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzSSAEnum.m (revision 15567) +++ /issm/trunk-jpl/src/m/enum/VzSSAEnum.m (revision 15567) @@ -0,0 +1,11 @@ +function macro=VzSSAEnum() +%VZSSAENUM - Enum of VzSSA +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=VzSSAEnum() + +macro=StringToEnum('VzSSA'); Index: sm/trunk-jpl/src/m/enum/VzStokesEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/VzStokesEnum.m (revision 15566) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=VzStokesEnum() -%VZSTOKESENUM - Enum of VzStokes -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh -% Please read src/c/shared/Enum/README for more information -% -% Usage: -% macro=VzStokesEnum() - -macro=StringToEnum('VzStokes'); Index: /issm/trunk-jpl/src/m/mech/mechanicalproperties.m =================================================================== --- /issm/trunk-jpl/src/m/mech/mechanicalproperties.m (revision 15566) +++ /issm/trunk-jpl/src/m/mech/mechanicalproperties.m (revision 15567) @@ -21,5 +21,5 @@ end if any(md.flowequation.element_equation~=2), - disp('Warning: the model has some non SSA elements. These will be treated like MacAyeal''s elements'); + disp('Warning: the model has some non SSA elements. These will be treated like SSA''s elements'); end Index: /issm/trunk-jpl/src/m/mech/strainrateuncert.m =================================================================== --- /issm/trunk-jpl/src/m/mech/strainrateuncert.m (revision 15566) +++ /issm/trunk-jpl/src/m/mech/strainrateuncert.m (revision 15567) @@ -36,5 +36,5 @@ end if any(md.flowequation.element_equation~=2), - disp('Warning: the model has some non SSA elements. These will be treated like MacAyeal''s elements'); + disp('Warning: the model has some non SSA elements. These will be treated like SSA''s elements'); end Index: /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m (revision 15566) +++ /issm/trunk-jpl/src/m/miscellaneous/issmdoc.m (revision 15567) @@ -11,5 +11,5 @@ disp(sprintf('%-63s %s',' md=setmask(md,''all'','''');','%defines the glacier system as an ice shelf (no island)')); disp(sprintf('%-63s %s',' md=parameterize(md,''Square.par'');','%fills all the other fields of the model')); -disp(sprintf('%-63s %s',' md=setflowequation(md,''SSA'',''all'');','%defines all elements as MacAyeal''s SSA')); +disp(sprintf('%-63s %s',' md=setflowequation(md,''SSA'',''all'');','%defines all elements as SSA''s SSA')); disp(sprintf('%-63s %s',' md=solve(md,DiagnosticSolutionEnum());','%solve for stress balance')); disp(sprintf('%-63s %s',' plotmodel(md,''data'',md.results.DiagnosticSolution.Vel);','%displays the velocity (type plotdoc for plotmodel help)')); Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.m =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setflowequation.m (revision 15566) +++ /issm/trunk-jpl/src/m/parameterization/setflowequation.m (revision 15567) @@ -116,5 +116,5 @@ end -%Now take care of the coupling between MacAyeal and HO +%Now take care of the coupling between SSA and HO md.diagnostic.vertex_pairing=[]; nodeonSSAHO=zeros(md.mesh.numberofvertices,1); @@ -125,5 +125,5 @@ HOFSflag=zeros(md.mesh.numberofelements,1); if strcmpi(coupling_method,'penalties'), - %Create the border nodes between HO and MacAyeal and extrude them + %Create the border nodes between HO and SSA and extrude them numnodes2d=md.mesh.numberofvertices2d; numlayers=md.mesh.numberoflayers; @@ -142,5 +142,5 @@ %Find node at the border nodeonSSAHO(find(nodeonSSA & nodeonHO))=1; - %SSA elements in contact with this layer become MacAyealHO elements + %SSA elements in contact with this layer become SSAHO elements matrixelements=ismember(md.mesh.elements,find(nodeonSSAHO)); commonelements=sum(matrixelements,2)~=0; @@ -206,5 +206,5 @@ %Find node at the border nodeonSSAFS(find(nodeonSSA & nodeonFS))=1; - %FS elements in contact with this layer become MacAyealFS elements + %FS elements in contact with this layer become SSAFS elements matrixelements=ismember(md.mesh.elements,find(nodeonSSAFS)); commonelements=sum(matrixelements,2)~=0; Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.py =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 15566) +++ /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 15567) @@ -112,5 +112,5 @@ noneflag[numpy.nonzero(numpy.logical_not(FSflag))]=True - #Now take care of the coupling between MacAyeal and HO + #Now take care of the coupling between SSA and HO md.diagnostic.vertex_pairing=numpy.array([]) nodeonSSAHO=numpy.zeros(md.mesh.numberofvertices,bool) @@ -121,5 +121,5 @@ HOFSflag=numpy.zeros(md.mesh.numberofelements,bool) if strcmpi(coupling_method,'penalties'): - #Create the border nodes between HO and MacAyeal and extrude them + #Create the border nodes between HO and SSA and extrude them numnodes2d=md.mesh.numberofvertices2d numlayers=md.mesh.numberoflayers @@ -137,5 +137,5 @@ #Find node at the border nodeonSSAHO[numpy.nonzero(numpy.logical_and(nodeonSSA,nodeonHO))]=True - #SSA elements in contact with this layer become MacAyealHO elements + #SSA elements in contact with this layer become SSAHO elements matrixelements=ismember(md.mesh.elements-1,numpy.nonzero(nodeonSSAHO)[0]) commonelements=numpy.sum(matrixelements,axis=1)!=0 @@ -201,5 +201,5 @@ #Find node at the border nodeonSSAFS[numpy.nonzero(numpy.logical_and(nodeonSSA,nodeonFS))]=True - #FS elements in contact with this layer become MacAyealFS elements + #FS elements in contact with this layer become SSAFS elements matrixelements=ismember(md.mesh.elements-1,numpy.nonzero(nodeonSSAFS)[0]) commonelements=numpy.sum(matrixelements,axis=1)!=0 @@ -233,5 +233,5 @@ raise TypeError("type of coupling not supported yet") - #Create MacAyealHOApproximation where needed + #Create SSAHOApproximation where needed md.flowequation.element_equation=numpy.zeros(md.mesh.numberofelements,int) md.flowequation.element_equation[numpy.nonzero(noneflag)]=0 Index: /issm/trunk-jpl/src/m/plot/plot_elementstype.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_elementstype.m (revision 15566) +++ /issm/trunk-jpl/src/m/plot/plot_elementstype.m (revision 15567) @@ -22,5 +22,5 @@ A=elements(posH,1); B=elements(posH,2); C=elements(posH,3); p1=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',1,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyeal element + %SSA element posM=find(data==2); A=elements(posM,1); B=elements(posM,2); C=elements(posM,3); @@ -30,5 +30,5 @@ A=elements(posP,1); B=elements(posP,2); C=elements(posP,3); p3=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',3,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyealHO element + %SSAHO element posMP=find(data==5); A=elements(posMP,1); B=elements(posMP,2); C=elements(posMP,3); @@ -38,5 +38,5 @@ A=elements(posS,1); B=elements(posS,2); C=elements(posS,3); p6=patch( 'Faces', [A B C], 'Vertices', [x y z],'CData',4,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyealFS elements + %SSAFS elements posMS=find(data==6); A=elements(posMS,1); B=elements(posMS,2); C=elements(posMS,3); @@ -52,6 +52,6 @@ legend([p1 p2 p3 p5 p6 p7 p8 p9],... - 'SIA''s elements','MacAyeal''s elements','HO''s elements',... - 'MacAyealHO''s elements','FS''s elements','MacAyealFS''s elements','HOFS''s elements','None element'); + 'SIA''s elements','SSA''s elements','HO''s elements',... + 'SSAHO''s elements','FS''s elements','SSAFS''s elements','HOFS''s elements','None element'); else @@ -64,5 +64,5 @@ patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', 1,'FaceColor','flat','EdgeColor',edgecolor); patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', 1,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyeal elements + %SSA elements posM=find(data==2); A=elements(posM,1); B=elements(posM,2); C=elements(posM,3); D=elements(posM,4); E=elements(posM,5); F=elements(posM,6); @@ -88,5 +88,5 @@ patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', 4,'FaceColor','flat','EdgeColor',edgecolor); patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', 4,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyealHO elements + %SSAHO elements posP=find(data==5); A=elements(posP,1); B=elements(posP,2); C=elements(posP,3); D=elements(posP,4); E=elements(posP,5); F=elements(posP,6); @@ -104,5 +104,5 @@ patch( 'Faces', [B E F C],'Vertices', [x y z],'CData', 7,'FaceColor','flat','EdgeColor',edgecolor); patch( 'Faces', [C A D F],'Vertices', [x y z],'CData', 7,'FaceColor','flat','EdgeColor',edgecolor); - %MacAyealFS elements + %SSAFS elements PosMS=find(data==6); A=elements(PosMS,1); B=elements(PosMS,2); C=elements(PosMS,3); D=elements(PosMS,4); E=elements(PosMS,5); F=elements(PosMS,6); @@ -122,6 +122,6 @@ legend([p1 p2 p3 p4 p5 p6 p7 p8],... - 'SIA''s elements','MacAyeal''s elements','HO''s elements','FS''s elements',... - 'MacAyealHO''s elements','HOFS''s elements','MacAyealFS''s elements','None elements'); + 'SIA''s elements','SSA''s elements','HO''s elements','FS''s elements',... + 'SSAHO''s elements','HOFS''s elements','SSAFS''s elements','None elements'); end Index: /issm/trunk-jpl/src/m/plot/plot_penalties.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_penalties.m (revision 15566) +++ /issm/trunk-jpl/src/m/plot/plot_penalties.m (revision 15567) @@ -40,5 +40,5 @@ P2=plot3(x(md.penalties(i,:)),y(md.penalties(i,:)),z(md.penalties(i,:)),'bo-','LineWidth',2,'MarkerSize',8,'MarkerFaceColor','b'); end - legend([P1 P2],'MacAyeal''s penalized nodes','HO''s penalized nodes'); + legend([P1 P2],'SSA''s penalized nodes','HO''s penalized nodes'); end