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

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

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

revision 1628 by phornby, Fri Jul 11 13:12:46 2008 UTC revision 1637 by ksteube, Mon Jul 14 05:34:59 2008 UTC
# Line 159  void Paso_SolverFCT_solve(Paso_FCTranspo Line 159  void Paso_SolverFCT_solve(Paso_FCTranspo
159            n_substeps=1;            n_substeps=1;
160         }         }
161         dt2=dt/n_substeps;         dt2=dt/n_substeps;
162         printf("%d time steps of size is %e (theta = %e, dt_max=%e).\n",n_substeps, dt2,fctp->theta, dt_max);         printf("%ld time steps of size is %e (theta = %e, dt_max=%e).\n",n_substeps, dt2,fctp->theta, dt_max);
163         /*         /*
164      * seperate source into positive and negative part:      * seperate source into positive and negative part:
165      */      */
# Line 185  void Paso_SolverFCT_solve(Paso_FCTranspo Line 185  void Paso_SolverFCT_solve(Paso_FCTranspo
185          tolerance=options->tolerance;          tolerance=options->tolerance;
186          while(n<n_substeps && Paso_noError()) {          while(n<n_substeps && Paso_noError()) {
187    
188              printf("substep step %d at t=%e\n",n+1,t);              printf("substep step %ld at t=%e\n",n+1,t);
189              /*              /*
190               * b^n[i]=m u^n[i] + dt2*(1-theta) sum_{j <> i} l_{ij}*(u^n[j]-u^n[i]) + dt2*sourceP[i]               * b^n[i]=m u^n[i] + dt2*(1-theta) sum_{j <> i} l_{ij}*(u^n[j]-u^n[i]) + dt2*sourceP[i]
191               *               *
# Line 255  void Paso_SolverFCT_solve(Paso_FCTranspo Line 255  void Paso_SolverFCT_solve(Paso_FCTranspo
255                 m=0;                 m=0;
256                 converged=FALSE;                 converged=FALSE;
257                 while ( (!converged) && (m<max_m) && Paso_noError()) {                 while ( (!converged) && (m<max_m) && Paso_noError()) {
258                      printf("iteration step %d\n",m+1);                      printf("iteration step %ld\n",m+1);
259                      /*                      /*
260                       *  set the ant diffusion fluxes:                       *  set the ant diffusion fluxes:
261                       *                       *
# Line 348  void Paso_SolverFCT_solve(Paso_FCTranspo Line 348  void Paso_SolverFCT_solve(Paso_FCTranspo
348                         norm_du*=omega;                         norm_du*=omega;
349                         converged=(norm_du <= tolerance * norm_u);                         converged=(norm_du <= tolerance * norm_u);
350                         m++;                         m++;
351                         printf("iteration step %d: norm u and du_m : %e %e\n",m,norm_u,norm_du);                         printf("iteration step %ld: norm u and du_m : %e %e\n",m,norm_u,norm_du);
352                         /* TODO: check if du_m has been redu_mced */                         /* TODO: check if du_m has been redu_mced */
353                         Paso_Coupler_finishCollect(u_m_coupler);                         Paso_Coupler_finishCollect(u_m_coupler);
354                      } /* end of inner iteration */                      } /* end of inner iteration */

Legend:
Removed from v.1628  
changed lines
  Added in v.1637

  ViewVC Help
Powered by ViewVC 1.1.26