Changeset 4458

Timestamp:

07/08/10 10:01:56 (15 years ago)

Author:

Eric.Larour

Message:

Transferred MeltingIsPresent, MeltingConstraints and RiftIsPresent from loads
to PenaltyConstraintsx directory.
Added analysis_type as argument, to check in the loads.

Location:

issm/trunk/src/c

Files:

• Container/Loads.cpp (modified) (1 diff)
• Container/Loads.h (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• modules/PenaltyConstraintsx/MeltingConstraints.cpp (added)
• modules/PenaltyConstraintsx/MeltingIsPresent.cpp (added)
• modules/PenaltyConstraintsx/PenaltyConstraintsLocal.h (added)
• modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp (modified) (3 diffs)
• modules/PenaltyConstraintsx/RiftConstraints.cpp (modified) (5 diffs)
• modules/PenaltyConstraintsx/RiftConstraints.h (deleted)

issm/trunk/src/c/Container/Loads.cpp

@@ -43 +43 @@
 
 /*Numerics:*/
-/*FUNCTION Loads::MeltingIsPresent{{{1*/
-int   Loads::MeltingIsPresent(){
-
-        int i;
-        int found=0;
-        int mpi_found=0;
-
-        for(i=0;i<this->Size();i++){
-                Object* object=(Object*)this->GetObjectByOffset(i);
-                if (object->Enum()==PengridEnum){
-                        found=1;
-                        break;
-                }
-        }
-        
-        #ifdef _PARALLEL_
-        MPI_Reduce (&found,&mpi_found,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
-        MPI_Bcast(&mpi_found,1,MPI_INT,0,MPI_COMM_WORLD);                
-        found=mpi_found;
-        #endif
-
-        return found;
-}
-/*}}}*/
-/*FUNCTION Loads::MeltingConstraints{{{1*/
-void  Loads::MeltingConstraints(int* pconverged, int* pnum_unstable_constraints){
-
-        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;i<this->Size();i++){
-                Object* object=(Object*)this->GetObjectByOffset(i);
-                if(object->Enum()==PengridEnum){
-
-                        Pengrid* pengrid=(Pengrid*)object;
-                        pengrid->PenaltyConstrain(&unstable);
-                        num_unstable_constraints+=unstable;
-                }
-        }
-
-        #ifdef _PARALLEL_
-        MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,MPI_INT,MPI_SUM,0,MPI_COMM_WORLD );
-        MPI_Bcast(&sum_num_unstable_constraints,1,MPI_INT,0,MPI_COMM_WORLD);                
-        num_unstable_constraints=sum_num_unstable_constraints;
-        #endif
-
-        /*Have we converged? : */
-        if (num_unstable_constraints==0) converged=1;
-        else converged=0;
-
-        /*Assign output pointers: */
-        *pconverged=converged;
-        *pnum_unstable_constraints=num_unstable_constraints;
-}
-/*}}}*/
 /*FUNCTION Loads::NumberOfLoads{{{1*/
 int Loads::NumberOfLoads(void){

issm/trunk/src/c/Container/Loads.h

@@ -26 +26 @@
                 /*}}}*/
                 /*numerics: {{{1*/
-                int   MeltingIsPresent();
-                void  MeltingConstraints(int* pconverged, int* pnum_unstable_constraints);
                 int   NumberOfLoads(void);
                 void  OutputRifts(Vec riftproperties);

issm/trunk/src/c/Makefile.am

@@ -526 +526 @@
                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
+                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsLocal.h\
                                         ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
-                                        ./modules/PenaltyConstraintsx/RiftConstraints.h\
+                                        ./modules/PenaltyConstraintsx/MeltingConstraints.cpp\
+                                        ./modules/PenaltyConstraintsx/MeltingIsPresent.cpp\
                                         ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
                                         ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h\
@@ -1067 +1069 @@
                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp\
                                         ./modules/PenaltyConstraintsx/PenaltyConstraintsx.h\
+                                        ./modules/PenaltyConstraintsx/PenaltyConstraintsLocal.h\
                                         ./modules/PenaltyConstraintsx/RiftConstraints.cpp\
-                                        ./modules/PenaltyConstraintsx/RiftConstraints.h\
+                                        ./modules/PenaltyConstraintsx/MeltingConstraints.cpp\
+                                        ./modules/PenaltyConstraintsx/MeltingIsPresent.cpp\
                                         ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp\
                                         ./modules/PenaltySystemMatricesx/PenaltySystemMatricesx.h\

issm/trunk/src/c/modules/PenaltyConstraintsx/PenaltyConstraintsx.cpp

@@ -4 +4 @@
 
 #include "./PenaltyConstraintsx.h"
-#include "./RiftConstraints.h"
+#include "./PenaltyConstraintsLocal.h"
 #include "../../shared/shared.h"
 #include "../../include/include.h"
@@ -20 +20 @@
         int converged=0;
         int num_unstable_constraints=0;
-        int min_mechanical_constraints=0;
+        int min_mechanical_constraints=0; 
+        int analysis_type;
 
         /*recover parameters: */
@@ -32 +33 @@
         /*Do we have penalties linked to rifts? In this case, run our special rifts penalty 
          * management routine, otherwise, skip : */
-        if (RiftIsPresent(loads)){
-                RiftConstraints(&converged,&num_unstable_constraints,loads,min_mechanical_constraints);
+        if (RiftIsPresent(loads,analysis_type)){
+                RiftConstraints(&converged,&num_unstable_constraints,loads,min_mechanical_constraints,analysis_type);
         }
-        else if(loads->MeltingIsPresent()){
-                loads->MeltingConstraints(&converged,&num_unstable_constraints);
+        else if(MeltingIsPresent(loads,analysis_type)){
+                MeltingConstraints(loads,&converged,&num_unstable_constraints,analysis_type);
         }
         else{

issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp

@@ -3 +3 @@
  */
 
-#include "./RiftConstraints.h"
+#include "./PenaltyConstraintsLocal.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
 #include "../../include/include.h"
@@ -10 +10 @@
 #define _ZIGZAGCOUNTER_
 
-int RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints){
+int RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){
 
         int num_unstable_constraints=0;
@@ -16 +16 @@
         int potential;
         extern int my_rank;
+        ISSMERROR(" check analysis_type across all routine!");
 
         Constrain(&num_unstable_constraints,loads);
@@ -66 +67 @@
 }
 
-int RiftIsPresent(Loads* loads){
+int RiftIsPresent(Loads* loads,int analysis_type){
 
 
@@ -76 +77 @@
         /*go though loads, and figure out if one of the loads is a Riftfront: */
         for (i=0;i<loads->Size();i++){
-
-                if(RiftfrontEnum==loads->GetEnum(i)){
-                        found=1;
-                        break;
+                Load* load=(Load*)loads->GetObjectByOffset(i);
+                if(load->InAnalysis(analysis_type)){
+                        if(RiftfrontEnum==loads->GetEnum(i)){
+                                found=1;
+                                break;
+                        }
                 }
         }