Changeset 4837

Timestamp:

07/27/10 14:41:58 (15 years ago)

Author:

Mathieu Morlighem

Message:

no output from solver_linear

Location:

issm/trunk/src/c

Files:

• solutions/balancedthickness_core.cpp (modified) (1 diff)
• solutions/balancedvelocities_core.cpp (modified) (1 diff)
• solutions/bedslope_core.cpp (modified) (1 diff)
• solutions/diagnostic_core.cpp (modified) (2 diffs)
• solutions/prognostic_core.cpp (modified) (1 diff)
• solutions/stokescontrolinit.cpp (modified) (1 diff)
• solutions/surfaceslope_core.cpp (modified) (1 diff)
• solutions/thermal_core_step.cpp (modified) (1 diff)
• solvers/solver_linear.cpp (modified) (2 diffs)
• solvers/solvers.h (modified) (1 diff)

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

@@ -32 +32 @@
 
         _printf_("call computational core:\n");
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
 
         if(verbose)_printf_("saving results:\n");

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

@@ -32 +32 @@
 
         _printf_("call computational core:\n");
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
 
         if(verbose)_printf_("saving results:\n");

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

@@ -28 +28 @@
         /*Call on core computations: */
         femmodel->SetCurrentConfiguration(BedSlopeAnalysisEnum,BedSlopeXAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
         femmodel->SetCurrentConfiguration(BedSlopeAnalysisEnum,BedSlopeYAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
         
         if(verbose)_printf_("saving results:\n");

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

@@ -56 +56 @@
 
                 femmodel->SetCurrentConfiguration(DiagnosticHutterAnalysisEnum);
-                solver_linear(NULL,femmodel);
+                solver_linear(femmodel);
                 
                 if (ismacayealpattyn) ResetBoundaryConditions(femmodel,DiagnosticHorizAnalysisEnum);
@@ -73 +73 @@
                 if(verbose)_printf_("%s\n"," computing vertical velocities...");
                 femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
-                solver_linear(NULL,femmodel);
+                solver_linear(femmodel);
 
                 if (isstokes){

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

@@ -29 +29 @@
         
         _printf_("call computational core:\n");
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
                 
         if(verbose)_printf_("saving results:\n");

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

@@ -43 +43 @@
         solver_diagnostic_nonlinear(NULL,NULL,NULL,femmodel,conserve_loads);
         femmodel->SetCurrentConfiguration(DiagnosticVertAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
 
         if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");

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

@@ -28 +28 @@
         /*Call on core computations: */
         femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SurfaceSlopeXAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
         femmodel->SetCurrentConfiguration(SurfaceSlopeAnalysisEnum,SurfaceSlopeYAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
         
         if(verbose)_printf_("saving results:\n");

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

@@ -25 +25 @@
         if(verbose)_printf_("computing melting:\n");
         femmodel->SetCurrentConfiguration(MeltingAnalysisEnum);
-        solver_linear(NULL,femmodel);
+        solver_linear(femmodel);
 }

issm/trunk/src/c/solvers/solver_linear.cpp

@@ -8 +8 @@
 #include "../modules/modules.h"
 
-void solver_linear(Vec* pug, FemModel* fem){
+void solver_linear(FemModel* fem){
 
         /*parameters:*/
@@ -60 +60 @@
         /*free ressources: */
         xfree((void**)&solver_string);
+        VecFree(&ug);
         VecFree(&uf);
-
-        /*Assign output pointers:*/
-        if(pug) *pug=ug;
-        else VecFree(&ug);
 }

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

@@ -14 +14 @@
 void solver_thermal_nonlinear(Vec* ptg,double* pmelting_offset,FemModel* femmodel);
 void solver_diagnostic_nonlinear(Vec* pug,Mat* pK_ff0,Mat* pK_fs0, FemModel* femmodel,bool conserve_loads);
-void solver_linear(Vec* pug, FemModel* femmodel);
-void solver_adjoint(Vec* pug, FemModel* femmodel);
-
+void solver_linear(FemModel* femmodel);
 
 #endif