Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9217) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 9218) @@ -65,6 +65,6 @@ BalancethicknessSolutionEnum, BalancethicknessAnalysisEnum, - BalancevelocitiesSolutionEnum, - BalancevelocitiesAnalysisEnum, + Fake31Enum, + Fake32Enum, PrognosticSolutionEnum, PrognosticAnalysisEnum, Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 9217) +++ /issm/trunk/src/c/Makefile.am (revision 9218) @@ -484,8 +484,4 @@ ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\ ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp\ - ./modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateNodesBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateConstraintsBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateLoadsBalancevelocities.cpp\ ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp\ ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\ @@ -1175,8 +1171,4 @@ ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\ ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp\ - ./modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateNodesBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateConstraintsBalancevelocities.cpp\ - ./modules/ModelProcessorx/Balancevelocities/CreateLoadsBalancevelocities.cpp\ ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp\ ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\ @@ -1400,5 +1392,4 @@ ./solutions/prognostic_core.cpp\ ./solutions/balancethickness_core.cpp\ - ./solutions/balancevelocities_core.cpp\ ./solutions/surfaceslope_core.cpp\ ./solutions/bedslope_core.cpp\ Index: /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9217) +++ /issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 9218) @@ -58,6 +58,6 @@ case BalancethicknessSolutionEnum : return "BalancethicknessSolution"; case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis"; - case BalancevelocitiesSolutionEnum : return "BalancevelocitiesSolution"; - case BalancevelocitiesAnalysisEnum : return "BalancevelocitiesAnalysis"; + case Fake31Enum : return "Fake31"; + case Fake32Enum : return "Fake32"; case PrognosticSolutionEnum : return "PrognosticSolution"; case PrognosticAnalysisEnum : return "PrognosticAnalysis"; Index: /issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 9217) +++ /issm/trunk/src/c/modules/ModelProcessorx/CreateDataSets.cpp (revision 9218) @@ -109,10 +109,4 @@ break; - case BalancevelocitiesAnalysisEnum: - CreateNodesBalancevelocities(pnodes, iomodel,iomodel_handle); - CreateConstraintsBalancevelocities(pconstraints,iomodel,iomodel_handle); - CreateLoadsBalancevelocities(ploads,iomodel,iomodel_handle); - UpdateElementsBalancevelocities(elements,iomodel,iomodel_handle,analysis_counter,analysis_type); - break; default: _error_("%s%s%s"," analysis_type: ",EnumToStringx(analysis_type)," not supported yet!"); Index: /issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 9217) +++ /issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp (revision 9218) @@ -90,7 +90,4 @@ numdofs=1; } - else if (analysis_type==BalancevelocitiesAnalysisEnum){ - numdofs=1; - } else _error_("analysis type: %i (%s) not implemented yet",analysis_type,EnumToStringx(analysis_type)); Index: /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 9217) +++ /issm/trunk/src/c/modules/ModelProcessorx/ModelProcessorx.h (revision 9218) @@ -91,10 +91,4 @@ void UpdateElementsBalancethickness(Elements* elements,IoModel* iomodel,FILE* iomodel_handle,int analysis_counter,int analysis_type); -/*balancedvelocities:*/ -void CreateNodesBalancevelocities(Nodes** pnodes,IoModel* iomodel,FILE* iomodel_handle); -void CreateConstraintsBalancevelocities(Constraints** pconstraints,IoModel* iomodel,FILE* iomodel_handle); -void CreateLoadsBalancevelocities(Loads** ploads, IoModel* iomodel, FILE* iomodel_handle); -void UpdateElementsBalancevelocities(Elements* elements,IoModel* iomodel,FILE* iomodel_handle,int analysis_counter,int analysis_type); - /*transient: */ void UpdateElementsTransient(Elements* elements,Parameters* parameters,IoModel* iomodel,FILE* iomodel_handle,int analysis_counter,int analysis_type); Index: /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9217) +++ /issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 9218) @@ -56,6 +56,6 @@ else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; - else if (strcmp(name,"BalancevelocitiesSolution")==0) return BalancevelocitiesSolutionEnum; - else if (strcmp(name,"BalancevelocitiesAnalysis")==0) return BalancevelocitiesAnalysisEnum; + else if (strcmp(name,"Fake31")==0) return Fake31Enum; + else if (strcmp(name,"Fake32")==0) return Fake32Enum; else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; Index: /issm/trunk/src/c/objects/Elements/Penta.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9217) +++ /issm/trunk/src/c/objects/Elements/Penta.cpp (revision 9218) @@ -661,7 +661,4 @@ Ke=CreateKMatrixBalancethickness(); break; - case BalancevelocitiesAnalysisEnum: - Ke=CreateKMatrixBalancevelocities(); - break; case ThermalAnalysisEnum: Ke=CreateKMatrixThermal(); @@ -704,29 +701,4 @@ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. ElementMatrix* Ke=tria->CreateKMatrixBalancethickness(); - delete tria->matice; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*clean up and return*/ - return Ke; -} -/*}}}*/ -/*FUNCTION Penta::CreateKMatrixBalancevelocities {{{1*/ -ElementMatrix* Penta::CreateKMatrixBalancevelocities(void){ - - /*Figure out if this penta is collapsed. If so, then bailout, except if it is at the - bedrock, in which case we spawn a tria element using the 3 first nodes, and use it to build - the stiffness matrix. */ - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - /*Spawn Tria element from the base of the Penta: */ - Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementMatrix* Ke=tria->CreateKMatrixBalancevelocities(); delete tria->matice; delete tria; @@ -2390,7 +2362,4 @@ pe=CreatePVectorBalancethickness(); break; - case BalancevelocitiesAnalysisEnum: - pe=CreatePVectorBalancevelocities(); - break; case ThermalAnalysisEnum: pe=CreatePVectorThermal(); @@ -2473,26 +2442,4 @@ Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. ElementVector* pe=tria->CreatePVectorBalancethickness(); - delete tria->matice; delete tria; - - /*Delete Vx and Vy averaged*/ - this->inputs->DeleteInput(VxAverageEnum); - this->inputs->DeleteInput(VyAverageEnum); - - /*Clean up and return*/ - return pe; -} -/*}}}*/ -/*FUNCTION Penta::CreatePVectorBalancevelocities {{{1*/ -ElementVector* Penta::CreatePVectorBalancevelocities(void){ - - if (!IsOnBed()) return NULL; - - /*Depth Averaging Vx and Vy*/ - this->InputDepthAverageAtBase(VxEnum,VxAverageEnum); - this->InputDepthAverageAtBase(VyEnum,VyAverageEnum); - - /*Call Tria function*/ - Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria. - ElementVector* pe=tria->CreatePVectorBalancevelocities(); delete tria->matice; delete tria; @@ -5352,7 +5299,4 @@ else if (analysis_type==BalancethicknessAnalysisEnum){ InputUpdateFromSolutionOneDofCollapsed(solution,ThicknessEnum); - } - else if (analysis_type==BalancevelocitiesAnalysisEnum){ - InputUpdateFromSolutionOneDofCollapsed(solution,VelEnum); } else if (analysis_type==ThermalAnalysisEnum){ Index: /issm/trunk/src/c/objects/Elements/Penta.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Penta.h (revision 9217) +++ /issm/trunk/src/c/objects/Elements/Penta.h (revision 9218) @@ -151,5 +151,4 @@ void BedNormal(double* bed_normal, double xyz_list[3][3]); ElementMatrix* CreateKMatrixBalancethickness(void); - ElementMatrix* CreateKMatrixBalancevelocities(void); ElementMatrix* CreateKMatrixCouplingMacAyealPattyn(void); ElementMatrix* CreateKMatrixCouplingMacAyealPattynViscous(void); @@ -189,5 +188,4 @@ ElementMatrix* CreateKMatrixThermalShelf(void); ElementVector* CreatePVectorBalancethickness(void); - ElementVector* CreatePVectorBalancevelocities(void); ElementVector* CreatePVectorAdjointHoriz(void); ElementVector* CreatePVectorAdjointMacAyeal(void); Index: /issm/trunk/src/c/objects/Elements/Tria.cpp =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9217) +++ /issm/trunk/src/c/objects/Elements/Tria.cpp (revision 9218) @@ -414,7 +414,4 @@ Ke=CreateKMatrixAdjointBalancethickness(); break; - case BalancevelocitiesAnalysisEnum: - Ke=CreateKMatrixBalancevelocities(); - break; default: _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); @@ -615,121 +612,4 @@ &Bprime[0][0],2,numdof,0, &Ke->values[0],1); - } - - /*Clean up and return*/ - delete gauss; - return Ke; -} -/*}}}*/ -/*FUNCTION Tria::CreateKMatrixBalancevelocities {{{1*/ -ElementMatrix* Tria::CreateKMatrixBalancevelocities(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int artdiff; - int i,j,ig,dim; - double nx,ny,norm,Jdettria; - double dvx[2],dvy[2]; - double vx,vy,dvxdx,dvydy; - double v_gauss[2]={0.0}; - double surface_normal[3]; - double surface_list[3]; - double xyz_list[NUMVERTICES][3]; - double B[2][NUMVERTICES]; - double Bprime[2][NUMVERTICES]; - double K[2][2]={0.0}; - double KDL[2][2]={0.0}; - double DLprime[2][2]={0.0}; - double DL_scalar; - GaussTria *gauss=NULL; - - /*Initialize Element matrix*/ - ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - this->parameters->FindParam(&artdiff,ArtDiffEnum); - this->parameters->FindParam(&dim,DimEnum); - Input* surface_input=inputs->GetInput(SurfaceEnum); _assert_(surface_input); - Input* vxaverage_input=NULL; - Input* vyaverage_input=NULL; - if(dim==2){ - vxaverage_input=inputs->GetInput(VxEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyEnum); _assert_(vyaverage_input); - } - else{ - vxaverage_input=inputs->GetInput(VxAverageEnum); _assert_(vxaverage_input); - vyaverage_input=inputs->GetInput(VyAverageEnum); _assert_(vyaverage_input); - } - - /*Modify z so that it reflects the surface*/ - GetParameterListOnVertices(&surface_list[0],SurfaceEnum); - for(i=0;iGetParameterAverage(&nx); - vyaverage_input->GetParameterAverage(&ny); - if(nx==0 && ny==0){ - SurfaceNormal(&surface_normal[0],xyz_list); - nx=surface_normal[0]; - ny=surface_normal[1]; - } - if(nx==0 && ny==0){ - nx=0; ny=1; - } - norm=pow( pow(nx,2)+pow(ny,2) , (double).5); - nx=nx/norm; ny=ny/norm; - - //Create Artificial diffusivity once for all if requested - if(artdiff){ - gauss=new GaussTria(); - gauss->GaussCenter(); - GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); - delete gauss; - - vxaverage_input->GetParameterAverage(&v_gauss[0]); - vyaverage_input->GetParameterAverage(&v_gauss[1]); - K[0][0]=pow(10,2)*pow(Jdettria,(double).5)/2.0*fabs(v_gauss[0]); //pow should be zero!! - K[1][1]=pow(10,2)*pow(Jdettria,(double).5)/2.0*fabs(v_gauss[1]); - } - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for (ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); - GetBPrognostic(&B[0][0], &xyz_list[0][0], gauss); - GetBprimePrognostic(&Bprime[0][0], &xyz_list[0][0], gauss); - - vxaverage_input->GetParameterValue(&vx,gauss); - vyaverage_input->GetParameterValue(&vy,gauss); - vxaverage_input->GetParameterDerivativeValue(&dvx[0],&xyz_list[0][0],gauss); - vyaverage_input->GetParameterDerivativeValue(&dvy[0],&xyz_list[0][0],gauss); - - dvxdx=dvx[0]; - dvydy=dvy[1]; - DL_scalar=gauss->weight*Jdettria; - - DLprime[0][0]=DL_scalar*nx; - DLprime[1][1]=DL_scalar*ny; - - TripleMultiply( &B[0][0],2,numdof,1, - &DLprime[0][0],2,2,0, - &Bprime[0][0],2,numdof,0, - &Ke->values[0],1); - - if(artdiff){ - KDL[0][0]=DL_scalar*K[0][0]; - KDL[1][1]=DL_scalar*K[1][1]; - - TripleMultiply( &Bprime[0][0],2,numdof,1, - &KDL[0][0],2,2,0, - &Bprime[0][0],2,numdof,0, - &Ke->values[0],1); - } } @@ -1312,7 +1192,4 @@ pe=CreatePVectorAdjointBalancethickness(); break; - case BalancevelocitiesAnalysisEnum: - pe=CreatePVectorBalancevelocities(); - break; default: _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); @@ -1419,45 +1296,4 @@ for(i=0;ivalues[i]+=Jdettria*gauss->weight*(surface_mass_balance_g-basal_melting_g-dhdt_g)*L[i]; - } - - /*Clean up and return*/ - delete gauss; - return pe; -} -/*}}}*/ -/*FUNCTION Tria::CreatePVectorBalancevelocities {{{1*/ -ElementVector* Tria::CreatePVectorBalancevelocities(void){ - - /*Constants*/ - const int numdof=NDOF1*NUMVERTICES; - - /*Intermediaries */ - int i,j,ig; - double xyz_list[NUMVERTICES][3]; - double Jdettria,surface_mass_balance_g,basal_melting_g; - double L[NUMVERTICES]; - GaussTria* gauss=NULL; - - /*Initialize Element vector*/ - ElementVector* pe=new ElementVector(nodes,NUMVERTICES,this->parameters); - - /*Retrieve all inputs and parameters*/ - GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES); - Input* surface_mass_balance_input=inputs->GetInput(SurfaceMassBalanceEnum); _assert_(surface_mass_balance_input); - Input* basal_melting_input=inputs->GetInput(BasalMeltingRateEnum); _assert_(basal_melting_input); - - /* Start looping on the number of gaussian points: */ - gauss=new GaussTria(2); - for(ig=gauss->begin();igend();ig++){ - - gauss->GaussPoint(ig); - - GetJacobianDeterminant2d(&Jdettria, &xyz_list[0][0],gauss); - GetL(&L[0], &xyz_list[0][0], gauss,NDOF1); - - surface_mass_balance_input->GetParameterValue(&surface_mass_balance_g,gauss); - basal_melting_input->GetParameterValue(&basal_melting_g,gauss); - - for(i=0;ivalues[i]+=Jdettria*gauss->weight*(surface_mass_balance_g-basal_melting_g)*L[i]; } @@ -3519,7 +3355,4 @@ InputUpdateFromSolutionAdjointBalancethickness( solution); break; - case BalancevelocitiesAnalysisEnum: - InputUpdateFromSolutionOneDof(solution,VelEnum); - break; default: _error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type)); Index: /issm/trunk/src/c/objects/Elements/Tria.h =================================================================== --- /issm/trunk/src/c/objects/Elements/Tria.h (revision 9217) +++ /issm/trunk/src/c/objects/Elements/Tria.h (revision 9218) @@ -155,5 +155,4 @@ ElementMatrix* CreateKMatrixBalancethickness_DG(void); ElementMatrix* CreateKMatrixBalancethickness_CG(void); - ElementMatrix* CreateKMatrixBalancevelocities(void); ElementMatrix* CreateKMatrixDiagnosticMacAyeal(void); ElementMatrix* CreateKMatrixDiagnosticMacAyealViscous(void); @@ -169,5 +168,4 @@ ElementVector* CreatePVectorBalancethickness_DG(void); ElementVector* CreatePVectorBalancethickness_CG(void); - ElementVector* CreatePVectorBalancevelocities(void); ElementVector* CreatePVectorDiagnosticMacAyeal(void); ElementVector* CreatePVectorAdjointHoriz(void); Index: /issm/trunk/src/c/objects/Node.cpp =================================================================== --- /issm/trunk/src/c/objects/Node.cpp (revision 9217) +++ /issm/trunk/src/c/objects/Node.cpp (revision 9218) @@ -108,5 +108,5 @@ } - /*Prognostic/ Melting/ Slopecompute/ Balancevelocities/ Balancethickness*/ + /*Prognostic/ Melting/ Slopecompute/ Balancethickness*/ if ( analysis_type==PrognosticAnalysisEnum || @@ -114,5 +114,4 @@ analysis_type==BedSlopeAnalysisEnum || analysis_type==SurfaceSlopeAnalysisEnum || - analysis_type==BalancevelocitiesAnalysisEnum || analysis_type==BalancethicknessAnalysisEnum ){ Index: /issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp =================================================================== --- /issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 9217) +++ /issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp (revision 9218) @@ -43,7 +43,4 @@ solutioncore=&balancethickness_core; break; - case BalancevelocitiesSolutionEnum: - solutioncore=&balancevelocities_core; - break; case SurfaceSlopeSolutionEnum: solutioncore=&surfaceslope_core; Index: /issm/trunk/src/c/solutions/SolutionConfiguration.cpp =================================================================== --- /issm/trunk/src/c/solutions/SolutionConfiguration.cpp (revision 9217) +++ /issm/trunk/src/c/solutions/SolutionConfiguration.cpp (revision 9218) @@ -86,10 +86,4 @@ break; - case BalancevelocitiesSolutionEnum: - numanalyses=1; - analyses=(int*)xmalloc(numanalyses*sizeof(int)); - analyses[0]=BalancevelocitiesAnalysisEnum; - break; - case SurfaceSlopeSolutionEnum: numanalyses=1; Index: sm/trunk/src/c/solutions/balancevelocities_core.cpp =================================================================== --- /issm/trunk/src/c/solutions/balancevelocities_core.cpp (revision 9217) +++ (revision ) @@ -1,36 +1,0 @@ -/*!\file: balancevelocities_core.cpp - * \brief: core of the balancevelocities solution - */ - -#include "../toolkits/toolkits.h" -#include "../objects/objects.h" -#include "../shared/shared.h" -#include "../EnumDefinitions/EnumDefinitions.h" -#include "./solutions.h" -#include "../modules/modules.h" -#include "../solvers/solvers.h" - -void balancevelocities_core(FemModel* femmodel){ - - /*flags: */ - int dim; - bool control_analysis; - int solution_type; - - /*activate formulation: */ - femmodel->SetCurrentConfiguration(BalancevelocitiesAnalysisEnum); - - /*recover parameters: */ - femmodel->parameters->FindParam(&dim,DimEnum); - femmodel->parameters->FindParam(&control_analysis,ControlAnalysisEnum); - femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); - - _printf_(VerboseSolution()," call computational core\n"); - solver_linear(femmodel); - - if(solution_type==BalancevelocitiesSolutionEnum && !control_analysis){ - _printf_(VerboseSolution()," saving results\n"); - InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VelEnum); - } - -} Index: /issm/trunk/src/c/solutions/solutions.h =================================================================== --- /issm/trunk/src/c/solutions/solutions.h (revision 9217) +++ /issm/trunk/src/c/solutions/solutions.h (revision 9218) @@ -28,5 +28,4 @@ void prognostic_core(FemModel* femmodel); void balancethickness_core(FemModel* femmodel); -void balancevelocities_core(FemModel* femmodel); void slopecompute_core(FemModel* femmodel); void steadystate_core(FemModel* femmodel); Index: sm/trunk/src/m/enum/BalancevelocitiesAnalysisEnum.m =================================================================== --- /issm/trunk/src/m/enum/BalancevelocitiesAnalysisEnum.m (revision 9217) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=BalancevelocitiesAnalysisEnum() -%BALANCEVELOCITIESANALYSISENUM - Enum of BalancevelocitiesAnalysis -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=BalancevelocitiesAnalysisEnum() - -macro=StringToEnum('BalancevelocitiesAnalysis'); Index: sm/trunk/src/m/enum/BalancevelocitiesSolutionEnum.m =================================================================== --- /issm/trunk/src/m/enum/BalancevelocitiesSolutionEnum.m (revision 9217) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=BalancevelocitiesSolutionEnum() -%BALANCEVELOCITIESSOLUTIONENUM - Enum of BalancevelocitiesSolution -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=BalancevelocitiesSolutionEnum() - -macro=StringToEnum('BalancevelocitiesSolution'); Index: /issm/trunk/src/m/enum/Fake31Enum.m =================================================================== --- /issm/trunk/src/m/enum/Fake31Enum.m (revision 9218) +++ /issm/trunk/src/m/enum/Fake31Enum.m (revision 9218) @@ -0,0 +1,11 @@ +function macro=Fake31Enum() +%FAKE31ENUM - Enum of Fake31 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=Fake31Enum() + +macro=StringToEnum('Fake31'); Index: /issm/trunk/src/m/enum/Fake32Enum.m =================================================================== --- /issm/trunk/src/m/enum/Fake32Enum.m (revision 9218) +++ /issm/trunk/src/m/enum/Fake32Enum.m (revision 9218) @@ -0,0 +1,11 @@ +function macro=Fake32Enum() +%FAKE32ENUM - Enum of Fake32 +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh +% Please read src/c/EnumDefinitions/README for more information +% +% Usage: +% macro=Fake32Enum() + +macro=StringToEnum('Fake32'); Index: /issm/trunk/src/m/model/ismodelselfconsistent.m =================================================================== --- /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9217) +++ /issm/trunk/src/m/model/ismodelselfconsistent.m (revision 9218) @@ -573,20 +573,4 @@ if any(sum(abs(md.vx(md.elements)),2)==0 & sum(abs(md.vy(md.elements)),2)==0) message('model not consistent: at least one triangle has all its vertices with a zero velocity'); - end - %}}} - case BalancevelocitiesAnalysisEnum, - % {{{2 - %VELOCITIES MELTING AND ACCUMULATION - fields={'vx','vy','basal_melting_rate'}; - checksize(md,fields,[md.numberofnodes 1]); - checknan(md,fields); - - %SPC - if any((~isnan(md.spcvx(find(md.nodeonboundary))))~=1), - message(['model not consistent: model ' md.name ' should have all the nodes on boundary constrained in field spcvx']); - end - - if any((~isnan(md.spcvy(find(md.nodeonboundary))))~=1), - message(['model not consistent: model ' md.name ' should have all the nodes on boundary constrained in field spcvy']); end %}}} Index: /issm/trunk/src/m/model/process_solve_options.m =================================================================== --- /issm/trunk/src/m/model/process_solve_options.m (revision 9217) +++ /issm/trunk/src/m/model/process_solve_options.m (revision 9218) @@ -12,5 +12,5 @@ if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,... SteadystateSolutionEnum,ParametersSolutionEnum,TransientSolutionEnum,EnthalpySolutionEnum,... - BalancethicknessSolutionEnum,BalancevelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]), + BalancethicknessSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum,FlaimSolutionEnum]), error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']); end Index: /issm/trunk/src/m/model/solve.m =================================================================== --- /issm/trunk/src/m/model/solve.m (revision 9217) +++ /issm/trunk/src/m/model/solve.m (revision 9218) @@ -6,18 +6,17 @@ % where varargin is a lit of paired arguments of string OR enums % -% solution types available comprise: -% DiagnosticSolutionEnum -% PrognosticSolutionEnum -% ThermalSolutionEnum -% SteadystateSolutionEnum -% ParametersSolutionEnum -% TransientSolutionEnum... -% BalancethicknessSolutionEnum -% BalancevelocitiesSolutionEnum -% BedSlopeSolutionEnum -% SurfaceSlopeSolutionEnum -% GroundingLineMigration2DSolutionEnum -% HydrologySolutionEnum -% FlaimSolutionEnum +% solution types available comprise: +% DiagnosticSolutionEnum +% PrognosticSolutionEnum +% ThermalSolutionEnum +% SteadystateSolutionEnum +% ParametersSolutionEnum +% TransientSolutionEnum... +% BalancethicknessSolutionEnum +% BedSlopeSolutionEnum +% SurfaceSlopeSolutionEnum +% GroundingLineMigration2DSolutionEnum +% HydrologySolutionEnum +% FlaimSolutionEnum % % Examples: Index: /issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m =================================================================== --- /issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m (revision 9217) +++ /issm/trunk/src/m/solutions/CorePointerFromSolutionEnum.m (revision 9218) @@ -13,5 +13,4 @@ case PrognosticSolutionEnum, solutioncore='prognostic_core'; case BalancethicknessSolutionEnum, solutioncore='balancethickness_core'; - case BalancevelocitiesSolutionEnum, solutioncore='balancevelocities_core'; case SurfaceSlopeSolutionEnum, solutioncore='surfaceslope_core'; case BedSlopeSolutionEnum, solutioncore='bedslope_core'; Index: /issm/trunk/src/m/solutions/SolutionConfiguration.m =================================================================== --- /issm/trunk/src/m/solutions/SolutionConfiguration.m (revision 9217) +++ /issm/trunk/src/m/solutions/SolutionConfiguration.m (revision 9218) @@ -34,8 +34,4 @@ analyses=[BalancethicknessAnalysisEnum]; - case BalancevelocitiesSolutionEnum, - numanalyses=1; - analyses=[BalancevelocitiesAnalysisEnum]; - case SurfaceSlopeSolutionEnum, numanalyses=1; Index: sm/trunk/src/m/solutions/balancevelocities_core.m =================================================================== --- /issm/trunk/src/m/solutions/balancevelocities_core.m (revision 9217) +++ (revision ) @@ -1,23 +1,0 @@ -function femmodel=balancevelocities_core(femmdoel) -%BALANCEDVELOCITIES_CORE - linear solution sequence -% -% Usage: -% femmodel=balancevelocities_core(femmodel) - - %recover parameters common to all solutions - dim=femmodel.parameters.Dim; - control_analysis=femmodel.parameters.ControlAnalysis; - solution_type=femmodel.parameters.SolutionType; - - %Activate formulation - femmodel=SetCurrentConfiguration(femmodel,BalancevelocitiesAnalysisEnum); - - issmprintf(VerboseSolution,' call computational core'); - femmodel=solver_linear(femmodel); - - if (solution_type==BalancevelocitiesSolutionEnum & ~control_analysis), - issmprintf(VerboseSolution,' saving results'); - femmodel.elements=InputToResult(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,VelEnum); - end - -end %end function