Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 16006) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 16007) @@ -501,5 +501,10 @@ ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\ ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp\ + ./modules/ModelProcessorx/Balancevelocity/UpdateElementsBalancevelocity.cpp\ + ./modules/ModelProcessorx/Balancevelocity/CreateNodesBalancevelocity.cpp\ + ./modules/ModelProcessorx/Balancevelocity/CreateConstraintsBalancevelocity.cpp\ + ./modules/ModelProcessorx/Balancevelocity/CreateLoadsBalancevelocity.cpp\ ./analyses/balancethickness_core.cpp \ + ./analyses/balancevelocity_core.cpp \ ./analyses/dummy_core.cpp #}}} Index: /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/analyses/AnalysisConfiguration.cpp (revision 16007) @@ -89,4 +89,11 @@ break; + case BalancevelocitySolutionEnum: + numanalyses=2; + analyses=xNew(numanalyses); + analyses[0]=BalancevelocityAnalysisEnum; + analyses[1]=SurfaceSlopeAnalysisEnum; + break; + case SurfaceSlopeSolutionEnum: numanalyses=1; Index: /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/analyses/CorePointerFromSolutionEnum.cpp (revision 16007) @@ -65,4 +65,11 @@ #endif break; + case BalancevelocitySolutionEnum: + #ifdef _HAVE_BALANCED_ + solutioncore=&balancevelocity_core; + #else + _error_("ISSM was not compiled with balanced capabilities. Exiting"); + #endif + break; case HydrologySolutionEnum: #ifdef _HAVE_HYDROLOGY_ Index: /issm/trunk-jpl/src/c/analyses/analyses.h =================================================================== --- /issm/trunk-jpl/src/c/analyses/analyses.h (revision 16006) +++ /issm/trunk-jpl/src/c/analyses/analyses.h (revision 16007) @@ -30,4 +30,5 @@ void masstransport_core(FemModel* femmodel); void balancethickness_core(FemModel* femmodel); +void balancevelocity_core(FemModel* femmodel); void slopecompute_core(FemModel* femmodel); void steadystate_core(FemModel* femmodel); Index: /issm/trunk-jpl/src/c/analyses/balancevelocity_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/balancevelocity_core.cpp (revision 16007) +++ /issm/trunk-jpl/src/c/analyses/balancevelocity_core.cpp (revision 16007) @@ -0,0 +1,33 @@ +/*!\file: balancevelocity_core.cpp + * \brief: core of the balancevelocity solution + */ + +#include "./analyses.h" +#include "../toolkits/toolkits.h" +#include "../classes/classes.h" +#include "../shared/shared.h" +#include "../modules/modules.h" +#include "../solutionsequences/solutionsequences.h" + +void balancevelocity_core(FemModel* femmodel){ + + /*parameters: */ + bool save_results; + + + /*recover parameters: */ + femmodel->parameters->FindParam(&save_results,SaveResultsEnum); + + if(VerboseSolution()) _printf0_("call computational core:\n"); + surfaceslope_core(femmodel); + + if(VerboseSolution()) _printf0_("call computational core:\n"); + femmodel->SetCurrentConfiguration(BalancevelocityAnalysisEnum); + solutionsequence_linear(femmodel); + + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results\n"); + InputToResultx(femmodel,VelEnum); + } + +} Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 16007) @@ -244,4 +244,7 @@ return CreateKMatrixBalancethickness(); break; + case BalancevelocityAnalysisEnum: + return CreateKMatrixBalancevelocity(); + break; #endif #ifdef _HAVE_CONTROL_ @@ -385,4 +388,7 @@ case BalancethicknessAnalysisEnum: return CreatePVectorBalancethickness(); + break; + case BalancevelocityAnalysisEnum: + return CreatePVectorBalancevelocity(); break; #endif @@ -1599,4 +1605,7 @@ case BalancethicknessAnalysisEnum: InputUpdateFromSolutionOneDof(solution,ThicknessEnum); + break; + case BalancevelocityAnalysisEnum: + InputUpdateFromSolutionOneDof(solution,VelEnum); break; #endif @@ -7067,5 +7076,5 @@ vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); } - h=sqrt(2*this->GetArea()); + h=sqrt(2.*this->GetArea()); /*Start looping on the number of gaussian points:*/ @@ -7199,4 +7208,92 @@ } /*}}}*/ +/*FUNCTION Tria::CreateKMatrixBalancevelocity{{{*/ +ElementMatrix* Tria::CreateKMatrixBalancevelocity(void){ + + /*Intermediaries */ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dhdt_g,mb_g,ms_g,Jdettria; + IssmDouble h,gamma,thickness; + IssmDouble hnx,hny,dhnx[2],dhny[2]; + int i,j; + IssmDouble D_scalar; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Initialize Element matrix and vectors*/ + ElementMatrix* Ke = new ElementMatrix(nodes,numnodes,this->parameters,NoneApproximationEnum); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(2*numnodes); + IssmDouble* HNx = xNew(numnodes); + IssmDouble* HNy = xNew(numnodes); + IssmDouble* H = xNew(numnodes); + IssmDouble* Nx = xNew(numnodes); + IssmDouble* Ny = xNew(numnodes); + + /*Retrieve all Inputs and parameters: */ + GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + Input* H_input=inputs->GetInput(ThicknessEnum); _assert_(H_input); + + /*Get vector N for all nodes*/ + GetInputListOnNodes(Nx,SurfaceSlopeXEnum); + GetInputListOnNodes(Ny,SurfaceSlopeYEnum); + for(int i=0;iGetArea()); + + /*Start looping on the number of gaussian points:*/ + GaussTria* gauss=new GaussTria(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + H_input->GetInputValue(&thickness,gauss); + TriaRef::GetInputDerivativeValue(&dhnx[0],HNx,&xyz_list[0][0],gauss); + TriaRef::GetInputDerivativeValue(&dhny[0],HNy,&xyz_list[0][0],gauss); + TriaRef::GetInputValue(&hnx,HNx,gauss); + TriaRef::GetInputValue(&hny,HNy,gauss); + + gamma=h/(2.*thickness); + + GetJacobianDeterminant(&Jdettria, &xyz_list[0][0],gauss); + GetNodalFunctions(basis,gauss); + GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); + + for(int i=0;ivalues[i*numnodes+j] = gauss->weight*Jdettria*( + basis[i]*basis[j]*(dhnx[0]+dhny[1]) + + basis[i]*(dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny) + + gamma*(basis[j]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+j]*hnx + dbasis[1*numnodes+j]*hny)* + (basis[i]*(dhnx[0]+dhny[1]) + dbasis[0*numnodes+i]*hnx + dbasis[1*numnodes+i]*hny) + ); + } + } + } + + /*Clean up and return*/ + xDelete(basis); + xDelete(dbasis); + xDelete(H); + xDelete(Nx); + xDelete(Ny); + xDelete(HNx); + xDelete(HNy); + delete gauss; + return Ke; +} +/*}}}*/ /*FUNCTION Tria::CreatePVectorBalancethickness{{{*/ ElementVector* Tria::CreatePVectorBalancethickness(void){ @@ -7293,4 +7390,91 @@ /*Clean up and return*/ xDelete(basis); + delete gauss; + return pe; +} +/*}}}*/ +/*FUNCTION Tria::CreatePVectorBalancevelocity{{{*/ +ElementVector* Tria::CreatePVectorBalancevelocity(void){ + + /*Intermediaries */ + IssmDouble xyz_list[NUMVERTICES][3]; + IssmDouble dhdt_g,mb_g,ms_g,Jdettria; + IssmDouble h,gamma,thickness; + IssmDouble hnx,hny,dhnx[2],dhny[2]; + + /*Fetch number of nodes and dof for this finite element*/ + int numnodes = this->NumberofNodes(); + + /*Initialize Element vector and other vectors*/ + ElementVector* pe = new ElementVector(nodes,numnodes,this->parameters); + IssmDouble* basis = xNew(numnodes); + IssmDouble* dbasis = xNew(numnodes*2); + IssmDouble* HNx = xNew(numnodes); + IssmDouble* HNy = xNew(numnodes); + IssmDouble* H = xNew(numnodes); + IssmDouble* Nx = xNew(numnodes); + IssmDouble* Ny = xNew(numnodes); + + /*Retrieve all inputs and parameters*/ + GetVerticesCoordinates(&xyz_list[0][0],vertices,NUMVERTICES); + Input* ms_input=inputs->GetInput(SurfaceforcingsMassBalanceEnum); _assert_(ms_input); + Input* mb_input=inputs->GetInput(BasalforcingsMeltingRateEnum); _assert_(mb_input); + Input* dhdt_input=inputs->GetInput(BalancethicknessThickeningRateEnum); _assert_(dhdt_input); + Input* H_input=inputs->GetInput(ThicknessEnum); _assert_(H_input); + + /*Get vector N for all nodes*/ + GetInputListOnNodes(Nx,SurfaceSlopeXEnum); + GetInputListOnNodes(Ny,SurfaceSlopeYEnum); + for(int i=0;iGetArea()); + + /* Start looping on the number of gaussian points: */ + GaussTria* gauss=new GaussTria(2); + for(int ig=gauss->begin();igend();ig++){ + + gauss->GaussPoint(ig); + + ms_input->GetInputValue(&ms_g,gauss); + mb_input->GetInputValue(&mb_g,gauss); + dhdt_input->GetInputValue(&dhdt_g,gauss); + H_input->GetInputValue(&thickness,gauss); + + GetJacobianDeterminant(&Jdettria, &xyz_list[0][0],gauss); + GetNodalFunctions(basis,gauss); + GetNodalFunctionsDerivatives(dbasis,&xyz_list[0][0],gauss); + + TriaRef::GetInputDerivativeValue(&dhnx[0],HNx,&xyz_list[0][0],gauss); + TriaRef::GetInputDerivativeValue(&dhny[0],HNy,&xyz_list[0][0],gauss); + TriaRef::GetInputValue(&hnx,HNx,gauss); + TriaRef::GetInputValue(&hny,HNy,gauss); + + gamma=h/(2.*thickness); + + for(int i=0;ivalues[i]+=Jdettria*gauss->weight*(ms_g-mb_g-dhdt_g)*( + basis[i] + gamma*(basis[i]*(dhnx[0]+dhny[0])+hnx*dbasis[0] + hny*dbasis[1])); + } + } + + /*Clean up and return*/ + xDelete(basis); + xDelete(dbasis); + xDelete(H); + xDelete(Nx); + xDelete(Ny); + xDelete(HNx); + xDelete(HNy); delete gauss; return pe; Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.h =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16006) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.h (revision 16007) @@ -183,4 +183,5 @@ ElementMatrix* CreateKMatrixBalancethickness_DG(void); ElementMatrix* CreateKMatrixBalancethickness_CG(void); + ElementMatrix* CreateKMatrixBalancevelocity(void); ElementMatrix* CreateKMatrixMelting(void); ElementMatrix* CreateKMatrixMasstransport(void); @@ -194,4 +195,5 @@ ElementVector* CreatePVectorBalancethickness_DG(void); ElementVector* CreatePVectorBalancethickness_CG(void); + ElementVector* CreatePVectorBalancevelocity(void); ElementVector* CreatePVectorMasstransport(void); ElementVector* CreatePVectorMasstransport_CG(void); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateConstraintsBalancevelocity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateConstraintsBalancevelocity.cpp (revision 16007) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateConstraintsBalancevelocity.cpp (revision 16007) @@ -0,0 +1,17 @@ +#include "../../../toolkits/toolkits.h" +#include "../../../classes/classes.h" +#include "../../../shared/shared.h" +#include "../ModelProcessorx.h" +#include "../../IoModelToConstraintsx/IoModelToConstraintsx.h" + +void CreateConstraintsBalancevelocity(Constraints** pconstraints, IoModel* iomodel){ + + /*Recover pointer: */ + Constraints* constraints=*pconstraints; + + /*No constraints for now*/ + IoModelToConstraintsx(constraints,iomodel,BalancethicknessSpcthicknessEnum,BalancevelocityAnalysisEnum,P1Enum); + + /*Assign output pointer: */ + *pconstraints=constraints; +} Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateLoadsBalancevelocity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateLoadsBalancevelocity.cpp (revision 16007) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateLoadsBalancevelocity.cpp (revision 16007) @@ -0,0 +1,13 @@ +/*! \file CreateLoadsBalancevelocity.c: + */ + +#include "../../../toolkits/toolkits.h" +#include "../../../classes/classes.h" +#include "../../../shared/shared.h" +#include "../ModelProcessorx.h" + +void CreateLoadsBalancevelocity(Loads** ploads, IoModel* iomodel){ + + /*No loads*/ + +} Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateNodesBalancevelocity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateNodesBalancevelocity.cpp (revision 16007) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/CreateNodesBalancevelocity.cpp (revision 16007) @@ -0,0 +1,20 @@ +/* + * CreateNodesBalancevelocity.c: + */ + +#include "../../../toolkits/toolkits.h" +#include "../../../classes/classes.h" +#include "../../../shared/shared.h" +#include "../../MeshPartitionx/MeshPartitionx.h" +#include "../ModelProcessorx.h" + +void CreateNodesBalancevelocity(Nodes** pnodes, IoModel* iomodel){ + + /*Check in 3d*/ + if(iomodel->dim==3) _error_("DG 3d not implemented yet"); + + /*First fetch data: */ + iomodel->FetchData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); + CreateNodes(pnodes,iomodel,BalancevelocityAnalysisEnum,P1Enum); + iomodel->DeleteData(3,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,FlowequationVertexEquationEnum); +} Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/UpdateElementsBalancevelocity.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/UpdateElementsBalancevelocity.cpp (revision 16007) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Balancevelocity/UpdateElementsBalancevelocity.cpp (revision 16007) @@ -0,0 +1,37 @@ +/* + * UpdateElementsBalancevelocity: + */ + +#include "../../../toolkits/toolkits.h" +#include "../../../classes/classes.h" +#include "../../../shared/shared.h" +#include "../../MeshPartitionx/MeshPartitionx.h" +#include "../ModelProcessorx.h" + +void UpdateElementsBalancevelocity(Elements* elements, IoModel* iomodel,int analysis_counter,int analysis_type){ + + /*Update elements: */ + int counter=0; + for(int i=0;inumberofelements;i++){ + if(iomodel->my_elements[i]){ + Element* element=(Element*)elements->GetObjectByOffset(counter); + element->Update(i,iomodel,analysis_counter,analysis_type,P1Enum); + counter++; + } + } + + iomodel->FetchDataToInput(elements,ThicknessEnum); + iomodel->FetchDataToInput(elements,SurfaceEnum); + iomodel->FetchDataToInput(elements,BedEnum); + iomodel->FetchDataToInput(elements,MaskIceLevelsetEnum); + iomodel->FetchDataToInput(elements,VxEnum); + iomodel->FetchDataToInput(elements,VyEnum); + iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); + iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum); + iomodel->FetchDataToInput(elements,BalancethicknessThickeningRateEnum); + + if(iomodel->dim==3){ + iomodel->FetchDataToInput(elements,MeshElementonbedEnum); + iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum); + } +} Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 16007) @@ -114,4 +114,10 @@ UpdateElementsBalancethickness(elements,iomodel,analysis_counter,analysis_type); break; + case BalancevelocityAnalysisEnum: + CreateNodesBalancevelocity(pnodes, iomodel); + CreateConstraintsBalancevelocity(pconstraints,iomodel); + CreateLoadsBalancevelocity(ploads,iomodel); + UpdateElementsBalancevelocity(elements,iomodel,analysis_counter,analysis_type); + break; #endif Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 16007) @@ -115,4 +115,7 @@ numdofs=1; break; + case BalancevelocityAnalysisEnum: + numdofs=1; + break; default: _error_("analysis type: " << analysis_type << " (" << EnumToStringx(analysis_type) << ") not implemented yet"); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 16006) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 16007) @@ -119,4 +119,10 @@ void UpdateElementsBalancethickness(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); +/*balancedvelocity:*/ +void CreateNodesBalancevelocity(Nodes** pnodes,IoModel* iomodel); +void CreateConstraintsBalancevelocity(Constraints** pconstraints,IoModel* iomodel); +void CreateLoadsBalancevelocity(Loads** ploads, IoModel* iomodel); +void UpdateElementsBalancevelocity(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type); + /*transient: */ void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16006) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 16007) @@ -273,4 +273,6 @@ BalancethicknessSoftAnalysisEnum, BalancethicknessSoftSolutionEnum, + BalancevelocityAnalysisEnum, + BalancevelocitySolutionEnum, BedSlopeAnalysisEnum, BedSlopeSolutionEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 16007) @@ -279,4 +279,6 @@ case BalancethicknessSoftAnalysisEnum : return "BalancethicknessSoftAnalysis"; case BalancethicknessSoftSolutionEnum : return "BalancethicknessSoftSolution"; + case BalancevelocityAnalysisEnum : return "BalancevelocityAnalysis"; + case BalancevelocitySolutionEnum : return "BalancevelocitySolution"; case BedSlopeAnalysisEnum : return "BedSlopeAnalysis"; case BedSlopeSolutionEnum : return "BedSlopeSolution"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16006) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 16007) @@ -285,4 +285,6 @@ else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum; else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum; + else if (strcmp(name,"BalancevelocityAnalysis")==0) return BalancevelocityAnalysisEnum; + else if (strcmp(name,"BalancevelocitySolution")==0) return BalancevelocitySolutionEnum; else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; @@ -381,10 +383,10 @@ else if (strcmp(name,"NodeSId")==0) return NodeSIdEnum; else if (strcmp(name,"VectorParam")==0) return VectorParamEnum; - else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; - else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"Segment")==0) return SegmentEnum; + if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; + else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum; + else if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; @@ -504,10 +506,10 @@ else if (strcmp(name,"P2")==0) return P2Enum; else if (strcmp(name,"P2xP1")==0) return P2xP1Enum; - else if (strcmp(name,"P1xP2")==0) return P1xP2Enum; - else if (strcmp(name,"P1P1")==0) return P1P1Enum; else stage=5; } if(stage==5){ - if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; + if (strcmp(name,"P1xP2")==0) return P1xP2Enum; + else if (strcmp(name,"P1P1")==0) return P1P1Enum; + else if (strcmp(name,"P1P1GLS")==0) return P1P1GLSEnum; else if (strcmp(name,"MINI")==0) return MINIEnum; else if (strcmp(name,"MINIcondensed")==0) return MINIcondensedEnum;