Changeset 6024

Timestamp:

09/24/10 11:20:18 (14 years ago)

Author:

seroussi

Message:

added solver for stokes coupling in parallel

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• solutions/diagnostic_core.cpp (modified) (3 diffs)
• solvers/solver_stokescoupling_nonlinear.cpp (added)
• solvers/solvers.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -1149 +1149 @@
                                         ./solvers/solver_adjoint_linear.cpp\
                                         ./solvers/solver_diagnostic_nonlinear.cpp\
+                                        ./solvers/solver_stokescoupling_nonlinear.cpp\
                                         ./solvers/solver_thermal_nonlinear.cpp\
                                         ./modules/Bamgx/Bamgx.cpp\

issm/trunk/src/c/solutions/diagnostic_core.cpp

@@ -63 +63 @@
         }
 
-        if (ismacayealpattyn){
+        if (ismacayealpattyn^isstokes){
                 
                 if(verbose)_printf_("%s\n"," computing horizontal velocities...");
@@ -70 +70 @@
         }
         
-        
-        if (dim==3 & ~isstokes){
+        if (ismacayealpattyn && isstokes){
+
+                if(verbose)_printf_("%s\n"," computing coupling macayealpattyn and stokes velocities and pressure ...");
+                solver_stokescoupling_nonlinear(femmodel,conserve_loads);
+        }
+
+        if (dim==3 & (ishutter || ismacayealpattyn)){
 
                 if(verbose)_printf_("%s\n"," computing vertical velocities...");
@@ -78 +83 @@
         }
 
-        if (isstokes){
-
-                if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
-                femmodel->SetCurrentConfiguration(DiagnosticHorizAnalysisEnum);
-                solver_diagnostic_nonlinear(femmodel,conserve_loads);
-        }
 
         if(solution_type==DiagnosticSolutionEnum && !control_analysis){

issm/trunk/src/c/solvers/solvers.h

@@ -14 +14 @@
 void solver_thermal_nonlinear(FemModel* femmodel);
 void solver_diagnostic_nonlinear(FemModel* femmodel,bool conserve_loads);
+void solver_stokescoupling_nonlinear(FemModel* femmodel,bool conserve_loads);
 void solver_linear(FemModel* femmodel);
 void solver_adjoint_linear(FemModel* femmodel);