Changeset 17528

Timestamp:

03/24/14 14:08:14 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixed coupling FS

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -838 +838 @@
         femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum);
 
-        if(isFS){
+        if(isFS && !(isSSA || isHO || isL1L2)){
                 if(VerboseSolution()) _printf0_("   computing velocities\n");
 
@@ -849 +849 @@
                  solutionsequence_nonlinear(femmodel,conserve_loads); 
         }
-        else if(isSSA || isHO || isL1L2){ 
+        else if(!isFS && (isSSA || isHO || isL1L2)){ 
                 if(VerboseSolution()) _printf0_("   computing velocities\n");
 
@@ -865 +865 @@
                 }
         }
+        else if ((isSSA || isL1L2 || isHO) && isFS){
+                if(VerboseSolution()) _printf0_("   computing coupling between lower order models and FS\n");
+                solutionsequence_FScoupling_nonlinear(femmodel,conserve_loads);
+        }
         else{
                 _error_("not supported");
-        }
-
-        if ((isSSA || isL1L2 || isHO) && isFS){
-                if(VerboseSolution()) _printf0_("   computing coupling between lower order models and FS\n");
-                solutionsequence_FScoupling_nonlinear(femmodel,conserve_loads);
         }