Changeset 16210


Ignore:
Timestamp:
09/20/13 11:29:01 (12 years ago)
Author:
Mathieu Morlighem
Message:

BUG: HydrostaticRation is only required for Qmu analysis

Location:
issm/trunk-jpl/src/c
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/Makefile.am

    r16206 r16210  
    368368                                          ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
    369369                                          ./modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp\
     370                                          ./modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp\
    370371                                          ./analyses/dakota_core.cpp\
    371372                                          ./analyses/DakotaSpawnCore.h\

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.h

    r16181 r16210  
    2323void CreateParametersHydrologyDCEfficient(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type);
    2424void UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel);
     25void UpdateElementsAndMaterialsDakota(Elements* elements,Materials* materials, IoModel* iomodel);
    2526void CreateNodes(Nodes** pnodes, IoModel* iomodel,int analysis,int finite_element,int approximation=NoneApproximationEnum);
    2627

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/Stressbalance/UpdateElementsStressbalance.cpp

    r16167 r16210  
    8787        /*Create inputs: */
    8888        iomodel->FetchDataToInput(elements,ThicknessEnum);
    89         iomodel->FetchDataToInput(elements,GeometryHydrostaticRatioEnum);
    9089        iomodel->FetchDataToInput(elements,SurfaceEnum);
    9190        iomodel->FetchDataToInput(elements,BedEnum);

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceSIA/UpdateElementsStressbalanceSIA.cpp

    r15771 r16210  
    3131
    3232        iomodel->FetchDataToInput(elements,ThicknessEnum);
    33         iomodel->FetchDataToInput(elements,GeometryHydrostaticRatioEnum);
    3433
    3534        /*Free data: */

  • issm/trunk-jpl/src/c/modules/ModelProcessorx/StressbalanceVertical/UpdateElementsStressbalanceVertical.cpp

    r15986 r16210  
    2525
    2626        iomodel->FetchDataToInput(elements,ThicknessEnum);
    27         iomodel->FetchDataToInput(elements,GeometryHydrostaticRatioEnum);
    2827        iomodel->FetchDataToInput(elements,SurfaceEnum);
    2928        iomodel->FetchDataToInput(elements,BedEnum);
Note: See TracChangeset for help on using the changeset viewer.