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

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

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

revision 3004 by gross, Tue Mar 16 01:32:43 2010 UTC revision 3005 by gross, Thu Apr 22 05:59:31 2010 UTC
# Line 129  void Paso_TransportProblem_solve(Paso_Tr Line 129  void Paso_TransportProblem_solve(Paso_Tr
129          } else if (errorCode == SOLVER_BREAKDOWN) {          } else if (errorCode == SOLVER_BREAKDOWN) {
130              Paso_setError(VALUE_ERROR,"Paso_TransportProblem_solve: solver break down.");              Paso_setError(VALUE_ERROR,"Paso_TransportProblem_solve: solver break down.");
131          } else if (errorCode == SOLVER_NEGATIVE_NORM_ERROR) {          } else if (errorCode == SOLVER_NEGATIVE_NORM_ERROR) {
132              Paso_setError(VALUE_ERROR,"Paso_TransportProblem_solve: neagtove norm.");              Paso_setError(VALUE_ERROR,"Paso_TransportProblem_solve: negative norm.");
133          } else {          } else {
134              Paso_setError(SYSTEM_ERROR,"Paso_TransportProblem_solve: general error.");              Paso_setError(SYSTEM_ERROR,"Paso_TransportProblem_solve: general error.");
135          }          }
# Line 148  double Paso_TransportProblem_getSafeTime Line 148  double Paso_TransportProblem_getSafeTime
148  {  {
149     double dt_max, dt1, dt2;     double dt_max, dt1, dt2;
150     if ( ! fctp->valid_matrices) {     if ( ! fctp->valid_matrices) {
151         /* set row-sum of mass_matrix */
152         Paso_SystemMatrix_rowSum(fctp->mass_matrix,fctp->lumped_mass_matrix);
153         /* split off row-sum from transport_matrix */
154         Paso_SystemMatrix_makeZeroRowSums(fctp->transport_matrix,fctp->reactive_matrix);
155         /* get a copy of the main diagonal of the mass matrix */
156         Paso_SystemMatrix_copyFromMainDiagonal(fctp->mass_matrix,fctp->main_diagonal_mass_matrix);
157    
158        
159         /* XXXXXXXXX hier geht es weiter XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */
160       dt1=Paso_ReactiveSolver_getSafeTimeStepSize(fctp);       dt1=Paso_ReactiveSolver_getSafeTimeStepSize(fctp);
161       dt2=Paso_FCTSolver_getSafeTimeStepSize(fctp);       dt2=Paso_FCTSolver_getSafeTimeStepSize(fctp);
162       dt_max=MIN(dt1,dt2);       dt_max=MIN(dt1,dt2);

Legend:
Removed from v.3004  
changed lines
  Added in v.3005

  ViewVC Help
Powered by ViewVC 1.1.26