Index: /issm/trunk-jpl/src/c/Makefile.am =================================================================== --- /issm/trunk-jpl/src/c/Makefile.am (revision 16205) +++ /issm/trunk-jpl/src/c/Makefile.am (revision 16206) @@ -259,5 +259,4 @@ ./modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp\ ./modules/ModelProcessorx/CreateNodes.cpp\ - ./modules/ConstraintsStatex/PengridIsPresent.cpp\ ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.h\ ./modules/ParseToolkitsOptionsx/ParseToolkitsOptionsx.cpp\ @@ -409,6 +408,4 @@ ./modules/ModelProcessorx/Melting/CreateConstraintsMelting.cpp\ ./modules/ModelProcessorx/Melting/CreateLoadsMelting.cpp\ - ./modules/ConstraintsStatex/ThermalConstraintsState.cpp\ - ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp \ ./analyses/thermal_core.cpp\ ./analyses/enthalpy_core.cpp\ @@ -551,6 +548,4 @@ ./modules/ModelProcessorx/Damage/CreateNodesDamage.cpp \ ./modules/ModelProcessorx/Damage/CreateConstraintsDamage.cpp\ - ./modules/ConstraintsStatex/DamageConstraintsState.cpp\ - ./modules/ResetConstraintsx/DamageConstraintsReset.cpp \ ./modules/ModelProcessorx/Damage/CreateParametersDamage.cpp\ ./modules/ModelProcessorx/Damage/CreateLoadsDamage.cpp\ Index: /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 16205) +++ /issm/trunk-jpl/src/c/classes/Loads/Pengrid.cpp (revision 16206) @@ -814,6 +814,6 @@ /*FUNCTION Pengrid::ResetConstraint {{{*/ void Pengrid::ResetConstraint(void){ - active=0; - zigzag_counter=0; + active = 0; + zigzag_counter = 0; } /*}}}*/ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h (revision 16205) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStateLocal.h (revision 16206) @@ -15,25 +15,17 @@ #include "../../classes/classes.h" -/*melting: */ -void ThermalConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type); - -/*damage: */ -#ifdef _HAVE_DAMAGE_ -void DamageConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type); -#endif - /*rifts module: */ -void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type); -void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type); -int RiftIsFrozen(Loads* loads,int analysis_type); -void RiftFreezeConstraints(Loads* loads,int analysis_type); +void RiftConstraintsState(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type); +void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type); +int RiftIsFrozen(Loads* loads,int analysis_type); +void RiftFreezeConstraints(Loads* loads,int analysis_type); /*rifts, trial and errors: */ -int RiftIsPreStable(Loads* loads); -void RiftSetPreStable(Loads* loads); -void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads); -void RiftMaxPenetrationInInputs(Loads* loads); -int RiftPotentialUnstableConstraints(Loads* loads); -int RiftIsMaterialStable(Loads* loads); +int RiftIsPreStable(Loads* loads); +void RiftSetPreStable(Loads* loads); +void RiftPreConstrain(int* pnum_unstable_constraints,Loads* loads); +void RiftMaxPenetrationInInputs(Loads* loads); +int RiftPotentialUnstableConstraints(Loads* loads); +int RiftIsMaterialStable(Loads* loads); #endif /* _CONSTRAINTSSTATEX_H */ Index: /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.h (revision 16205) +++ /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.h (revision 16206) @@ -9,5 +9,4 @@ /* local prototypes: */ -int PengridIsPresent(Loads* loads,int analysis_type); int RiftIsPresent(Loads* loads,int analysis_type); void ConstraintsStatex(int* pconverged, int* pnum_unstable_constraints,FemModel* femmodel); Index: sm/trunk-jpl/src/c/modules/ConstraintsStatex/DamageConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/DamageConstraintsState.cpp (revision 16205) +++ (revision ) @@ -1,52 +1,0 @@ -/*!\file: DamageConstraintsState.cpp - * \brief melting rate constraints - */ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "./ConstraintsStateLocal.h" - -void DamageConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int configuration_type){ - - int i; - - int unstable=0; - int num_unstable_constraints=0; - int converged=0; - int sum_num_unstable_constraints=0; - - num_unstable_constraints=0; - - - /*Enforce constraints: */ - for(i=0;iSize();i++){ - Object* object=(Object*)loads->GetObjectByOffset(i); - Load* load=(Load*)object; - if(load->InAnalysis(configuration_type)){ - if(object->ObjectEnum()==PengridEnum){ - - Pengrid* pengrid=(Pengrid*)object; - - pengrid->ConstraintActivate(&unstable); - num_unstable_constraints+=unstable; - } - } - } - - - ISSM_MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() ); - ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm()); - num_unstable_constraints=sum_num_unstable_constraints; - - /*Have we converged? : */ - if (num_unstable_constraints==0) converged=1; - else converged=0; - - /*Assign output pointers: */ - *pconverged=converged; - *pnum_unstable_constraints=num_unstable_constraints; -} Index: sm/trunk-jpl/src/c/modules/ConstraintsStatex/PengridIsPresent.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/PengridIsPresent.cpp (revision 16205) +++ (revision ) @@ -1,35 +1,0 @@ -/*!\file: ThermalIsPresent.cpp - * \brief - */ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "./ConstraintsStateLocal.h" - -int PengridIsPresent(Loads* loads,int configuration_type){ - - int i; - int found=0; - int mpi_found=0; - - for(i=0;iSize();i++){ - Object* object=(Object*)loads->GetObjectByOffset(i); - Load* load=(Load*)object; - if(load->InAnalysis(configuration_type)){ - if (object->ObjectEnum()==PengridEnum){ - found=1; - break; - } - } - } - - ISSM_MPI_Reduce (&found,&mpi_found,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() ); - ISSM_MPI_Bcast(&mpi_found,1,ISSM_MPI_INT,0,IssmComm::GetComm()); - found=mpi_found; - - return found; -} Index: sm/trunk-jpl/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ConstraintsStatex/ThermalConstraintsState.cpp (revision 16205) +++ (revision ) @@ -1,49 +1,0 @@ -/*!\file: ThermalConstraintsState.cpp - * \brief melting rate constraints - */ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "./ConstraintsStateLocal.h" - -void ThermalConstraintsState(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int configuration_type){ - - int i; - - int unstable=0; - int num_unstable_constraints=0; - int converged=0; - int sum_num_unstable_constraints=0; - - num_unstable_constraints=0; - - /*Enforce constraints: */ - for(i=0;iSize();i++){ - Object* object=(Object*)loads->GetObjectByOffset(i); - Load* load=(Load*)object; - if(load->InAnalysis(configuration_type)){ - if(object->ObjectEnum()==PengridEnum){ - - Pengrid* pengrid=(Pengrid*)object; - pengrid->ConstraintActivate(&unstable); - num_unstable_constraints+=unstable; - } - } - } - - ISSM_MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() ); - ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm()); - num_unstable_constraints=sum_num_unstable_constraints; - - /*Have we converged? : */ - if (num_unstable_constraints==0) converged=1; - else converged=0; - - /*Assign output pointers: */ - *pconverged=converged; - *pnum_unstable_constraints=num_unstable_constraints; -} Index: sm/trunk-jpl/src/c/modules/ResetConstraintsx/DamageConstraintsReset.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/DamageConstraintsReset.cpp (revision 16205) +++ (revision ) @@ -1,29 +1,0 @@ -/*!\file: DamageConstraintsState.cpp - * \brief damage constraints reset - */ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "./ResetConstraintsx.h" - -void DamageConstraintsReset(Loads* loads, int configuration_type){ - - int i; - - /*Enforce constraints: */ - for(i=0;iSize();i++){ - Object* object=(Object*)loads->GetObjectByOffset(i); - Load* load=(Load*)object; - if(load->InAnalysis(configuration_type)){ - if(object->ObjectEnum()==PengridEnum){ - - Pengrid* pengrid=(Pengrid*)object; - pengrid->ResetConstraint(); - } - } - } -} Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 16205) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp (revision 16206) @@ -23,6 +23,5 @@ femmodel->parameters->FindParam(&analysis_type,AnalysisTypeEnum); - /*Do we have penalties linked to rifts? In this case, run our special rifts penalty - * management routine, otherwise, skip : */ + /*Deal with rift first*/ #ifdef _HAVE_RIFTS_ if(RiftIsPresent(femmodel->loads,analysis_type)){ @@ -30,14 +29,14 @@ } #endif - #ifdef _HAVE_THERMAL_ - if(PengridIsPresent(femmodel->loads,ThermalAnalysisEnum)){ - ThermalConstraintsReset(femmodel->loads,analysis_type); + + /*Reset pengrid to inactive mode*/ + for(int i=0;iloads->Size();i++){ + Load* load=(Load*)femmodel->loads->GetObjectByOffset(i); + if(load->InAnalysis(analysis_type)){ + if(load->ObjectEnum()==PengridEnum){ + Pengrid* pengrid=(Pengrid*)load; + pengrid->ResetConstraint(); + } + } } - #endif - #ifdef _HAVE_DAMAGE_ - if(PengridIsPresent(femmodel->loads,DamageEvolutionAnalysisEnum)){ - DamageConstraintsReset(femmodel->loads,analysis_type); - } - #endif - } Index: /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h (revision 16205) +++ /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.h (revision 16206) @@ -9,6 +9,4 @@ /* local prototypes: */ -void ThermalConstraintsReset(Loads* loads, int configuration_type); -void DamageConstraintsReset(Loads* loads, int configuration_type); void ResetConstraintsx(FemModel* femmodel); Index: sm/trunk-jpl/src/c/modules/ResetConstraintsx/ThermalConstraintsReset.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ResetConstraintsx/ThermalConstraintsReset.cpp (revision 16205) +++ (revision ) @@ -1,29 +1,0 @@ -/*!\file: ThermalConstraintsState.cpp - * \brief melting rate constraints - */ - -#ifdef HAVE_CONFIG_H - #include -#else -#error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" -#endif - -#include "./ResetConstraintsx.h" - -void ThermalConstraintsReset(Loads* loads, int configuration_type){ - - int i; - - /*Enforce constraints: */ - for(i=0;iSize();i++){ - Object* object=(Object*)loads->GetObjectByOffset(i); - Load* load=(Load*)object; - if(load->InAnalysis(configuration_type)){ - if(object->ObjectEnum()==PengridEnum){ - - Pengrid* pengrid=(Pengrid*)object; - pengrid->ResetConstraint(); - } - } - } -}