Changeset 9127


Ignore:
Timestamp:
07/26/11 18:21:35 (14 years ago)
Author:
Eric.Larour
Message:

Adding module to reset constraints, in qmu analysis

Location:
issm/trunk/src/c
Files:
4 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r9110 r9127  
    668668                                        ./modules/RequestedOutputsx/RequestedOutputsx.h\
    669669                                        ./modules/RequestedOutputsx/RequestedOutputsx.cpp\
     670                                        ./modules/ResetConstraintsx/ResetConstraintsx.h\
     671                                        ./modules/ResetConstraintsx/ResetConstraintsx.cpp\
     672                                        ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp\
    670673                                        ./modules/Scotchx/Scotchx.cpp\
    671674                                        ./modules/Scotchx/Scotchx.h\
    … …  
    13451348                                        ./modules/RequestedOutputsx/RequestedOutputsx.h\
    13461349                                        ./modules/RequestedOutputsx/RequestedOutputsx.cpp\
     1350                                        ./modules/ResetConstraintsx/ResetConstraintsx.h\
     1351                                        ./modules/ResetConstraintsx/ResetConstraintsx.cpp\
     1352                                        ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp\
    13471353                                        ./modules/Solverx/Solverx.cpp\
    13481354                                        ./modules/Solverx/Solverx.h\

  • issm/trunk/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h

    r8410 r9127  
    1111/*melting: */
    1212void  ThermalConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type);
    13 int   ThermalIsPresent(Loads* loads,int analysis_type);
    1413
    1514/*rifts module: */
    16 int    RiftIsPresent(Loads* loads,int analysis_type);
    1715void   RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type);
    1816void   RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type);

  • issm/trunk/src/c/modules/ConstraintsStatex/ConstraintsStatex.h

    r8404 r9127  
    1010
    1111/* local prototypes: */
     12int   ThermalIsPresent(Loads* loads,int analysis_type);
     13int    RiftIsPresent(Loads* loads,int analysis_type);
    1214void ConstraintsStatex(int* pconverged, int* pnum_unstable_constraints, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads,Materials* materials,  Parameters* parameters);
    1315

  • issm/trunk/src/c/modules/modules.h

    r9110 r9127  
    9292#include "./Reducevectorgtofx/Reducevectorgtofx.h"
    9393#include "./RequestedOutputsx/RequestedOutputsx.h"
     94#include "./ResetConstraintsx/ResetConstraintsx.h"
    9495#include "./Responsex/Responsex.h"
    9596#include "./RheologyBbarx/RheologyBbarx.h"

  • issm/trunk/src/c/objects/Loads/Pengrid.cpp

    r8800 r9127  
    678678}
    679679/*}}}1*/
     680/*FUNCTION Pengrid::ResetConstraint {{{1*/
     681void  Pengrid::ResetConstraint(void){
     682        active=0;
     683        zigzag_counter=0;
     684}
     685/*}}}1*/

  • issm/trunk/src/c/objects/Loads/Pengrid.h

    r8800 r9127  
    8787                void  ConstraintActivateThermal(int* punstable);
    8888                void  UpdateInputs(double* solution);
     89                void  ResetConstraint(void);
    8990                /*}}}*/
    9091

  • issm/trunk/src/c/solutions/thermal_core.cpp

    r9126 r9127  
    4343        if(qmu_analysis){
    4444                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperatureEnum);
     45                InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,QmuTemperatureEnum,TemperaturePicardEnum);
     46                ResetConstraintsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    4547        }
    4648
Note: See TracChangeset for help on using the changeset viewer.