Changeset 4402
- Timestamp:
- 07/06/10 09:08:11 (15 years ago)
- Location:
- issm/trunk/src/c/objects
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/objects/Elements/Penta.cpp
r4396 r4402 691 691 } 692 692 else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){ 693 CreateKMatrixSlope Compute( Kgg);693 CreateKMatrixSlope( Kgg); 694 694 } 695 695 else if (analysis_type==PrognosticAnalysisEnum){ … … 741 741 } 742 742 else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){ 743 CreatePVectorSlope Compute( pg);743 CreatePVectorSlope( pg); 744 744 } 745 745 else if (analysis_type==PrognosticAnalysisEnum){ … … 3204 3204 } 3205 3205 /*}}}*/ 3206 /*FUNCTION Penta::CreateKMatrixSlope Compute{{{1*/3207 3208 void Penta::CreateKMatrixSlope Compute(Mat Kgg){3206 /*FUNCTION Penta::CreateKMatrixSlope {{{1*/ 3207 3208 void Penta::CreateKMatrixSlope(Mat Kgg){ 3209 3209 3210 3210 /*Collapsed formulation: */ … … 4108 4108 } 4109 4109 /*}}}*/ 4110 /*FUNCTION Penta::CreatePVectorSlope Compute{{{1*/4111 4112 void Penta::CreatePVectorSlope Compute( Vec pg){4110 /*FUNCTION Penta::CreatePVectorSlope {{{1*/ 4111 4112 void Penta::CreatePVectorSlope( Vec pg){ 4113 4113 4114 4114 /*Collapsed formulation: */ -
issm/trunk/src/c/objects/Elements/Penta.h
r4396 r4402 120 120 void CreateKMatrixMelting(Mat Kggg); 121 121 void CreateKMatrixPrognostic(Mat Kggg); 122 void CreateKMatrixSlope Compute(Mat Kggg);122 void CreateKMatrixSlope(Mat Kggg); 123 123 void CreateKMatrixThermal(Mat Kggg); 124 124 void CreatePVectorBalancedthickness( Vec pg); … … 130 130 void CreatePVectorMelting( Vec pg); 131 131 void CreatePVectorPrognostic( Vec pg); 132 void CreatePVectorSlope Compute( Vec pg);132 void CreatePVectorSlope( Vec pg); 133 133 void CreatePVectorThermal( Vec pg); 134 134 double* GaussFromNode(Node* node); -
issm/trunk/src/c/objects/Elements/Tria.cpp
r4396 r4402 625 625 } 626 626 else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){ 627 CreateKMatrixSlope Compute( Kgg);627 CreateKMatrixSlope( Kgg); 628 628 } 629 629 else if (analysis_type==PrognosticAnalysisEnum){ … … 672 672 } 673 673 else if (analysis_type==BedSlopeXAnalysisEnum || analysis_type==SurfaceSlopeXAnalysisEnum || analysis_type==BedSlopeYAnalysisEnum || analysis_type==SurfaceSlopeYAnalysisEnum){ 674 CreatePVectorSlope Compute( pg);674 CreatePVectorSlope( pg); 675 675 } 676 676 else if (analysis_type==PrognosticAnalysisEnum){ … … 3565 3565 } 3566 3566 /*}}}*/ 3567 /*FUNCTION Tria::CreateKMatrixSlope Compute{{{1*/3568 3569 void Tria::CreateKMatrixSlope Compute(Mat Kgg){3567 /*FUNCTION Tria::CreateKMatrixSlope {{{1*/ 3568 3569 void Tria::CreateKMatrixSlope(Mat Kgg){ 3570 3570 3571 3571 /* local declarations */ … … 4368 4368 } 4369 4369 /*}}}*/ 4370 /*FUNCTION Tria::CreatePVectorSlopeCompute {{{1*/ 4371 4372 void Tria::CreatePVectorSlopeCompute( Vec pg){ 4370 /*FUNCTION Tria::CreatePVectorSlope {{{1*/ 4371 void Tria::CreatePVectorSlope( Vec pg){ 4373 4372 4374 4373 int i,j; -
issm/trunk/src/c/objects/Elements/Tria.h
r4394 r4402 119 119 void CreateKMatrixPrognostic(Mat Kgg); 120 120 void CreateKMatrixPrognostic2(Mat Kgg); 121 void CreateKMatrixSlope Compute(Mat Kgg);121 void CreateKMatrixSlope(Mat Kgg); 122 122 void CreateKMatrixThermal(Mat Kgg); 123 123 void CreatePVectorBalancedthickness(Vec pg); … … 129 129 void CreatePVectorPrognostic(Vec pg); 130 130 void CreatePVectorPrognostic2(Vec pg); 131 void CreatePVectorSlope Compute( Vec pg);131 void CreatePVectorSlope( Vec pg); 132 132 void CreatePVectorThermalSheet( Vec pg); 133 133 void CreatePVectorThermalShelf( Vec pg); -
issm/trunk/src/c/objects/FemModel.cpp
r4356 r4402 149 149 * analysis_type to drive the element numerics. This allows for use of 1 configuration_type for several 150 150 * analyses. For example: do a SurfaceSlopeX, SurfaceSlopeY, BedSlopeX and BedSlopeY analysis using the 151 * Slope Computeconfiguration.*/151 * Slope configuration.*/ 152 152 153 153 int found=-1;
Note:
See TracChangeset
for help on using the changeset viewer.