Changeset 18729

Timestamp:

11/04/14 09:36:59 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying what Melting Analysis needs

File:

• issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/MeltingAnalysis.cpp

@@ -10 +10 @@
 }/*}}}*/
 void MeltingAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
-        parameters->AddObject(iomodel->CopyConstantObject(FrictionLawEnum));
 }/*}}}*/
 void MeltingAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
@@ -29 +28 @@
         }
 
-        iomodel->Constant(&frictionlaw,FrictionLawEnum);
-
         /*Create inputs: */
         iomodel->FetchDataToInput(elements,ThicknessEnum);
@@ -40 +37 @@
                 iomodel->FetchDataToInput(elements,MeshVertexonsurfaceEnum);
         }
-        iomodel->FetchDataToInput(elements,MaterialsRheologyBEnum);
-        iomodel->FetchDataToInput(elements,MaterialsRheologyNEnum);
-        iomodel->FetchDataToInput(elements,BasalforcingsGroundediceMeltingRateEnum);
         iomodel->FetchDataToInput(elements,PressureEnum);
-        
-        /*Friction law variables*/
-        switch(frictionlaw){
-                case 1:
-                        iomodel->FetchDataToInput(elements,FrictionCoefficientEnum);
-                        iomodel->FetchDataToInput(elements,FrictionPEnum);
-                        iomodel->FetchDataToInput(elements,FrictionQEnum);
-                        break;
-                case 2:
-                        iomodel->FetchDataToInput(elements,FrictionCEnum);
-                        iomodel->FetchDataToInput(elements,FrictionMEnum);
-                        break;
-                default:
-                        _error_("not supported");
-        }
 }/*}}}*/
 void MeltingAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/