Changeset 24313 for issm/trunk/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp (modified) (4 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

issm/trunk/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

@@ -20 +20 @@
         for (i=0;i<loads->Size();i++){
                 Load* load=(Load*)loads->GetObjectByOffset(i);
-                if(load->InAnalysis(configuration_type)){
-                        if(RiftfrontEnum==loads->GetEnum(i)){
-                                found=1;
-                                break;
-                        }
+                if(RiftfrontEnum==loads->GetEnum(i)){
+                        found=1;
+                        break;
                 }
         }
@@ -77 +75 @@
 
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(configuration_type)){
-
-                                riftfront=(Riftfront*)load;
-
-                                riftfront->Constrain(&unstable);
-
-                                num_unstable_constraints+=unstable;
-                        }
+                        riftfront=(Riftfront*)load;
+                        riftfront->Constrain(&unstable);
+                        num_unstable_constraints+=unstable;
                 }
         }
@@ -114 +107 @@
 
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(configuration_type)){
-
-                                riftfront=(Riftfront*)load;
-                                if (riftfront->IsFrozen()){
-                                        found=1;
-                                        break;
-                                }
+                        riftfront=(Riftfront*)load;
+                        if (riftfront->IsFrozen()){
+                                found=1;
+                                break;
                         }
                 }
@@ -146 +136 @@
 
                 if (RiftfrontEnum==loads->GetEnum(i)){
-
                         load=(Load*)loads->GetObjectByOffset(i);
-                        if(load->InAnalysis(configuration_type)){
-
-                                riftfront=(Riftfront*)load;
-                                riftfront->FreezeConstraints();
-                        }
-
+                        riftfront=(Riftfront*)load;
+                        riftfront->FreezeConstraints();
                 }
         }

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota