/[escript]/trunk/paso/src/FCTSolver.c
ViewVC logotype

Diff of /trunk/paso/src/FCTSolver.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 3119 by gross, Fri Aug 13 08:38:06 2010 UTC revision 3120 by gross, Mon Aug 30 10:48:00 2010 UTC
# Line 186  err_t Paso_FCTSolver_Function_call(Paso_ Line 186  err_t Paso_FCTSolver_Function_call(Paso_
186        /* Paso_Solver(more->transportproblem->iteration_matrix,value,F->tmp,&options,pp); */        /* Paso_Solver(more->transportproblem->iteration_matrix,value,F->tmp,&options,pp); */
187                
188                
189        Paso_Solver_solvePreconditioner(more->transportproblem->iteration_matrix,value,F->tmp);        Paso_SystemMatrix_solvePreconditioner(more->transportproblem->iteration_matrix,value,F->tmp);
190        return NO_ERROR;        return NO_ERROR;
191  }  }
192    
# Line 232  err_t Paso_FCTSolver_solve(Paso_Function Line 232  err_t Paso_FCTSolver_solve(Paso_Function
232                            
233                   while ( (!converged) && (!diverged) && (! max_m_reached) && Paso_noError()) {                   while ( (!converged) && (!diverged) && (! max_m_reached) && Paso_noError()) {
234                  errorCode=Paso_FCTSolver_Function_call(F,du, u, pp);                  errorCode=Paso_FCTSolver_Function_call(F,du, u, pp);
235                        options->num_iter++;
236                      Paso_Update(n,1.,u,omega,du);                      Paso_Update(n,1.,u,omega,du);
237                       norm_u=Paso_lsup(n,u, fctp->mpi_info);                       norm_u=Paso_lsup(n,u, fctp->mpi_info);
238               norm_du_old=norm_du;               norm_du_old=norm_du;
# Line 348  void Paso_FCTSolver_Function_initialize( Line 349  void Paso_FCTSolver_Function_initialize(
349             fctp->iteration_matrix->mainBlock->val[main_iptr[i]]=rtmp4;             fctp->iteration_matrix->mainBlock->val[main_iptr[i]]=rtmp4;
350      }      }
351      Performance_startMonitor(pp,PERFORMANCE_PRECONDITIONER_INIT);      Performance_startMonitor(pp,PERFORMANCE_PRECONDITIONER_INIT);
352      Paso_Solver_setPreconditioner(fctp->iteration_matrix,options);      Paso_SystemMatrix_setPreconditioner(fctp->iteration_matrix,options);
353      Performance_stopMonitor(pp,PERFORMANCE_PRECONDITIONER_INIT);      Performance_stopMonitor(pp,PERFORMANCE_PRECONDITIONER_INIT);
354  }  }
355    

Legend:
Removed from v.3119  
changed lines
  Added in v.3120

  ViewVC Help
Powered by ViewVC 1.1.26