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

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

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

revision 3093 by lgao, Tue Jun 29 00:45:49 2010 UTC revision 3094 by gross, Fri Aug 13 08:38:06 2010 UTC
# Line 57  void Paso_Options_setDefaults(Paso_Optio Line 57  void Paso_Options_setDefaults(Paso_Optio
57    options->coarsening_method=PASO_DEFAULT;    options->coarsening_method=PASO_DEFAULT;
58    options->relaxation_factor=0.95;    options->relaxation_factor=0.95;
59    options->smoother=PASO_GS;    options->smoother=PASO_GS;
60      options->use_local_preconditioner=FALSE;
61    
62    /* diagnostic values */    /* diagnostic values */
63    options->num_iter=-1;    options->num_iter=-1;
# Line 67  void Paso_Options_setDefaults(Paso_Optio Line 68  void Paso_Options_setDefaults(Paso_Optio
68    options->net_time=-1.;    options->net_time=-1.;
69    options->residual_norm=-1.;    options->residual_norm=-1.;
70    options->converged=FALSE;    options->converged=FALSE;
71      options->preconditioner_size=-1.;
72  }  }
73  void Paso_Options_showDiagnostics(const Paso_Options* options) {  void Paso_Options_showDiagnostics(const Paso_Options* options) {
74      printf("Paso diagonsitics:\n");      printf("Paso diagonsitics:\n");
# Line 78  void Paso_Options_showDiagnostics(const Line 80  void Paso_Options_showDiagnostics(const
80          printf("\tnet_time = %e\n",options->net_time);          printf("\tnet_time = %e\n",options->net_time);
81      printf("\tresidual_norm = %e\n",options->residual_norm);      printf("\tresidual_norm = %e\n",options->residual_norm);
82      printf("\tconverged = %d\n",options->converged);      printf("\tconverged = %d\n",options->converged);
83            printf("\tpreconditioner_size = %e Mbytes\n", options->preconditioner_size);
84  }  }
85  const char* Paso_Options_name(const index_t key){  const char* Paso_Options_name(const index_t key){
86      switch (key) {      switch (key) {
# Line 95  const char* Paso_Options_name(const inde Line 98  const char* Paso_Options_name(const inde
98            return "CGS";            return "CGS";
99         case  PASO_BICGSTAB:         case  PASO_BICGSTAB:
100            return "BICGSTAB";            return "BICGSTAB";
        case  PASO_SSOR:  
           return "SSOR";  
101         case  PASO_ILU0:         case  PASO_ILU0:
102            return "ILU0";            return "ILU0";
103         case  PASO_ILUT:         case  PASO_ILUT:
# Line 139  const char* Paso_Options_name(const inde Line 140  const char* Paso_Options_name(const inde
140            return "MINRES";            return "MINRES";
141         case  PASO_GAUSS_SEIDEL:         case  PASO_GAUSS_SEIDEL:
142            return "GAUSS_SEIDEL";            return "GAUSS_SEIDEL";
        case  PASO_GAUSS_SEIDEL_MPI:  
           return "GAUSS_SEIDEL_MPI";  
143         case  PASO_RILU:         case  PASO_RILU:
144            return "RILU";            return "RILU";
145         case  PASO_DEFAULT_REORDERING:         case  PASO_DEFAULT_REORDERING:
# Line 159  const char* Paso_Options_name(const inde Line 158  const char* Paso_Options_name(const inde
158            return "STANDARD_COARSENING";            return "STANDARD_COARSENING";
159         case  PASO_NO_PRECONDITIONER:         case  PASO_NO_PRECONDITIONER:
160            return "NO_PRECONDITIONER";            return "NO_PRECONDITIONER";
        case  PASO_MIN_COARSE_MATRIX_SIZE:  
           return "MIN_COARSE_MATRIX_SIZE";  
161         default:         default:
162        return "<unknown>";        return "<unknown>";
163      }      }
# Line 191  void Paso_Options_show(const Paso_Option Line 188  void Paso_Options_show(const Paso_Option
188      printf("\taccept_failed_convergence = %d\n",options->accept_failed_convergence);      printf("\taccept_failed_convergence = %d\n",options->accept_failed_convergence);
189      printf("\tcoarsening_method = %s (%d)\n",Paso_Options_name(options->coarsening_method), options->coarsening_method);      printf("\tcoarsening_method = %s (%d)\n",Paso_Options_name(options->coarsening_method), options->coarsening_method);
190      printf("\trelaxation_factor = %e\n",options->relaxation_factor);      printf("\trelaxation_factor = %e\n",options->relaxation_factor);
191        printf("\tuse_local_preconditioner = %d\n",options->use_local_preconditioner);
192  }  }

Legend:
Removed from v.3093  
changed lines
  Added in v.3094

  ViewVC Help
Powered by ViewVC 1.1.26