Changeset 2330

Timestamp:

09/25/09 17:00:28 (15 years ago)

Author:

Mathieu Morlighem

Message:

renamed debug -> verbose

Location:

issm/trunk/src

Files:

• c/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/ModelProcessorx/IoModel.cpp (modified) (2 diffs)
• c/ModelProcessorx/IoModel.h (modified) (1 diff)
• c/Qmux/SpawnCoreParallel.cpp (modified) (7 diffs)
• c/parallel/ControlInitialization.cpp (modified) (7 diffs)
• c/parallel/control_core.cpp (modified) (1 diff)
• c/parallel/convergence.cpp (modified) (6 diffs)
• c/parallel/diagnostic_core.cpp (modified) (9 diffs)
• c/parallel/diagnostic_core_linear.cpp (modified) (3 diffs)
• c/parallel/diagnostic_core_nonlinear.cpp (modified) (7 diffs)
• c/parallel/gradjcompute_core.cpp (modified) (2 diffs)
• c/parallel/prognostic_core.cpp (modified) (2 diffs)
• c/parallel/steadystate_core.cpp (modified) (4 diffs)
• c/parallel/thermal_core.cpp (modified) (4 diffs)
• c/parallel/thermal_core_nonlinear.cpp (modified) (7 diffs)
• c/parallel/transient_core_2d.cpp (modified) (2 diffs)
• c/parallel/transient_core_3d.cpp (modified) (8 diffs)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/@model/setdefaultparameters.m (modified) (1 diff)
• m/classes/public/display/displaydiagnostic.m (modified) (1 diff)
• m/classes/public/marshall.m (modified) (1 diff)
• m/classes/public/solve.m (modified) (3 diffs)
• m/classes/public/solveparallel.m (modified) (1 diff)
• m/solutions/cielo/ControlInitialization.m (modified) (6 diffs)
• m/solutions/cielo/CreateFemModel.m (modified) (1 diff)
• m/solutions/cielo/SpawnCore.m (modified) (1 diff)
• m/solutions/cielo/control_core.m (modified) (6 diffs)
• m/solutions/cielo/convergence.m (modified) (6 diffs)
• m/solutions/cielo/diagnostic.m (modified) (2 diffs)
• m/solutions/cielo/diagnostic_core.m (modified) (6 diffs)
• m/solutions/cielo/diagnostic_core_linear.m (modified) (1 diff)
• m/solutions/cielo/diagnostic_core_nonlinear.m (modified) (2 diffs)
• m/solutions/cielo/gradjcompute_core.m (modified) (6 diffs)
• m/solutions/cielo/prognostic.m (modified) (4 diffs)
• m/solutions/cielo/prognostic_core.m (modified) (2 diffs)
• m/solutions/cielo/steadystate.m (modified) (3 diffs)
• m/solutions/cielo/steadystate_core.m (modified) (3 diffs)
• m/solutions/cielo/thermal.m (modified) (3 diffs)
• m/solutions/cielo/thermal_core.m (modified) (2 diffs)
• m/solutions/cielo/thermal_core_nonlinear.m (modified) (3 diffs)
• m/solutions/cielo/transient2d.m (modified) (2 diffs)
• m/solutions/cielo/transient3d.m (modified) (8 diffs)
• m/solutions/dakota/preqmu.m (modified) (1 diff)
• m/utils/BC/SetIceSheetBC.m (modified) (1 diff)
• m/utils/BC/SetIceShelfBC.m (modified) (1 diff)
• m/utils/BC/SetMarineIceSheetBC.m (modified) (1 diff)
• m/utils/String/displaystring.m (modified) (1 diff)

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -71 +71 @@
         parameters->AddObject(param);
 
-        /*debug: */
-        param= new Param(count,"debug",INTEGER);
-        param->SetInteger(iomodel->debug);
+        /*verbose: */
+        param= new Param(count,"verbose",INTEGER);
+        param->SetInteger(iomodel->verbose);
         parameters->AddObject(param);
 

issm/trunk/src/c/ModelProcessorx/IoModel.cpp

@@ -119 +119 @@
         iomodel->mincontrolconstraint=0;
         iomodel->maxcontrolconstraint=0;
-        iomodel->debug=0;
+        iomodel->verbose=0;
         iomodel->plot=0;
         iomodel->eps_res=0;
@@ -329 +329 @@
         IoModelFetchData((void**)&iomodel->meanvel,NULL,NULL,iomodel_handle,"meanvel","Scalar",NULL);
         IoModelFetchData((void**)&iomodel->epsvel,NULL,NULL,iomodel_handle,"epsvel","Scalar",NULL);
-        IoModelFetchData((void**)&iomodel->debug,NULL,NULL,iomodel_handle,"debug","Integer",NULL);
+        IoModelFetchData((void**)&iomodel->verbose,NULL,NULL,iomodel_handle,"verbose","Integer",NULL);
         IoModelFetchData((void**)&iomodel->plot,NULL,NULL,iomodel_handle,"plot","Integer",NULL);
         IoModelFetchData((void**)&iomodel->artificial_diffusivity,NULL,NULL,iomodel_handle,"artificial_diffusivity","Integer",NULL);

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -117 +117 @@
         double  mincontrolconstraint;
         double  maxcontrolconstraint;
-        int     debug;
+        int     verbose;
         int     plot;
         double  eps_res;

issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp

@@ -50 +50 @@
         double* qmu_part=NULL;
         int     qmu_npart;
-        int     debug=0;
+        int     verbose=0;
 
         extern int my_rank;
@@ -59 +59 @@
         
         /*some parameters needed: */
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
                 
         /*First off, recover the response descriptors for the response functions: */
@@ -146 +146 @@
         if(analysis_type==DiagnosticAnalysisEnum()){
                         
-                if(debug)_printf_("Starting diagnostic core\n");
+                if(verbose)_printf_("Starting diagnostic core\n");
 
                 diagnostic_core(results,model,inputs);
@@ -153 +153 @@
         else if(analysis_type==ThermalAnalysisEnum()){
                 
-                if(debug)_printf_("Starting thermal core\n");
+                if(verbose)_printf_("Starting thermal core\n");
                 thermal_core(results,model,inputs);
 
@@ -159 +159 @@
         else if(analysis_type==PrognosticAnalysisEnum()){
 
-                if(debug)_printf_("Starting prognostic core\n");
+                if(verbose)_printf_("Starting prognostic core\n");
                 prognostic_core(results,model,inputs);
 
@@ -165 +165 @@
         else if(analysis_type==TransientAnalysisEnum()){
 
-                if(debug)_printf_("Starting transient core\n");
+                if(verbose)_printf_("Starting transient core\n");
                 transient_core(results,model,inputs);
 
@@ -174 +174 @@
 
         /*Now process the outputs, before computing the dakota responses: */
-        if(debug)_printf_("process results:\n");
+        if(verbose)_printf_("process results:\n");
 
         ProcessResults(&processed_results,results,model,analysis_type); 
 
         /*compute responses on cpu 0: dummy for now! */
-        if(debug)_printf_("compute dakota responses:\n");
+        if(verbose)_printf_("compute dakota responses:\n");
         DakotaResponses(responses,responses_descriptors,numresponses,model,results,processed_results,analysis_type,sub_analysis_type);
 

issm/trunk/src/c/parallel/ControlInitialization.cpp

@@ -34 +34 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int dim=-1;
         int ishutter=0;
@@ -54 +54 @@
 
         /*first recover parameters common to all solutions:*/
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
         model->FindParam(&dim,"dim");
         model->FindParam(&ishutter,"ishutter");
@@ -83 +83 @@
 
         //compute slopes
-        if(debug)_printf_("%s\n","computing bed slope (x and y derivatives)...");
+        if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
         diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
         diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
@@ -97 +97 @@
 
         //horizontal velocity
-        if(debug)_printf_("%s\n"," computing horizontal velocities...");
+        if(verbose)_printf_("%s\n"," computing horizontal velocities...");
         diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
-        if(debug)_printf_("%s\n"," extruding horizontal velocities...");
+        if(verbose)_printf_("%s\n"," extruding horizontal velocities...");
         VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->loads,fem_dh-> materials,"velocity",1);
 
         //vertical velocity
-        if(debug)_printf_("%s\n"," computing vertical velocities...");
+        if(verbose)_printf_("%s\n"," computing vertical velocities...");
         inputs->Add("velocity",ug_horiz,numberofdofspernode_dh,numberofnodes);
         diagnostic_core_linear(&ug_vert,fem_dv,inputs,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 
         //Create 3d u_g
-        if(debug)_printf_("%s\n"," combining horizontal and vertical velocities...");
+        if(verbose)_printf_("%s\n"," combining horizontal and vertical velocities...");
         VecFree(&ug); ug=NewVec(numberofnodes*3);
         xfree((void**)&dofset);dofset=dofsetgen(2,&dof01[0],3,numberofnodes*3); VecMerge(ug,ug_horiz,dofset,numberofnodes*2);
@@ -115 +115 @@
 
         //Create 4d u_g
-        if(debug)_printf_("%s\n"," computing pressure according to Pattyn...");
+        if(verbose)_printf_("%s\n"," computing pressure according to Pattyn...");
         ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->loads,  fem_dh->materials, numberofnodes);
         VecScale(pg,1.0/stokesreconditioning);
@@ -127 +127 @@
 
         //update spcs
-        if(debug)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
+        if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
         xfree((void**)&dofset);dofset=dofsetgen(3,dof012,4,numberofnodes*4); VecMerge(fem_ds->yg->vector,ug,dofset,3*numberofnodes);
         
@@ -134 +134 @@
 
         //Compute Stokes velocities to speed up later runs
-        if(debug)_printf_("%s\n"," computing stokes velocities and pressure ...");
+        if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
         VecFree(&ug);
         diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());

issm/trunk/src/c/parallel/control_core.cpp

@@ -52 +52 @@
         int sub_analysis_type;
         int     control_steady;
-        int debug=0;
+        int verbose=0;
         int convergence=0;
         int numberofnodes;

issm/trunk/src/c/parallel/convergence.cpp

@@ -30 +30 @@
         double eps_rel;
         double eps_abs;
-        int    debug;
+        int    verbose;
         double yts;
 
@@ -38 +38 @@
         parameters->FindParam((void*)&eps_abs,"eps_abs");
         parameters->FindParam((void*)&yts,"yts");
-        parameters->FindParam((void*)&debug,"debug");
+        parameters->FindParam((void*)&verbose,"verbose");
 
         /*Display solver caracteristics*/
-        if (debug>1){
+        if (verbose>1){
 
                 //compute KUF = KU - F = K*U - F
@@ -81 +81 @@
         //print
         if(res<eps_res){
-                if (debug) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," \%");
+                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," < ",eps_res*100," \%");
                 converged=1;
         }
         else{ 
-                if (debug) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," \%");
+                if (verbose) _printf_("%-50s%g%s%g%s\n","   mechanical equilibrium convergence criterion",res*100," > ",eps_res*100," \%");
                 converged=0;
         }
 
         /*Relative criterion (optional)*/
-        if (!isnan(eps_rel) || (debug>1)){
+        if (!isnan(eps_rel) || (verbose>1)){
 
                 //compute norm(du)/norm(u)
@@ -104 +104 @@
                 if (!isnan(eps_rel)){
                         if((ndu/nu)<eps_rel){
-                                if (debug) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," \%");
+                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," < ",eps_rel*100," \%");
                         }
                         else{ 
-                                if (debug) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," \%");
+                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: norm(du)/norm(u)",ndu/nu*100," > ",eps_rel*100," \%");
                                 converged=0;
                         }
@@ -116 +116 @@
 
         /*Absolute criterion (Optional) = max(du)*/
-        if (!isnan(eps_abs) || (debug>1)){
+        if (!isnan(eps_abs) || (verbose>1)){
 
                 //compute max(du)
@@ -129 +129 @@
                 if (!isnan(eps_abs)){
                         if ((nduinf*yts)<eps_abs){
-                                if (debug) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
+                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," < ",eps_abs," m/yr");
                         }
                         else{
-                                if (debug) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
+                                if (verbose) _printf_("%-50s%g%s%g%s\n","   Convergence criterion: max(du)",nduinf*yts," > ",eps_abs," m/yr");
                                 converged=0;
                         }

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

@@ -39 +39 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int qmu_analysis=0;
         int dim=-1;
@@ -62 +62 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
         model->FindParam(&dim,"dim");
         model->FindParam(&ishutter,"ishutter");
@@ -92 +92 @@
         if(ishutter){
                         
-                if(debug)_printf_("%s\n","computing surface slope (x and y derivatives)...");
+                if(verbose)_printf_("%s\n","computing surface slope (x and y derivatives)...");
                 diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceXAnalysisEnum());
                 diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceYAnalysisEnum());
@@ -98 +98 @@
                 if (dim==3){
                 
-                        if(debug)_printf_("%s\n","extruding slopes in 3d...");
+                        if(verbose)_printf_("%s\n","extruding slopes in 3d...");
                         FieldExtrudex( slopex, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,"slopex",0);
                         FieldExtrudex( slopey, fem_sl->elements,fem_sl->nodes,fem_sl->loads,fem_sl->materials,"slopex",0);
                 }
 
-                if(debug)_printf_("%s\n"," adding slopes in inputs...");
+                if(verbose)_printf_("%s\n"," adding slopes in inputs...");
                 inputs->Add("surfaceslopex",slopex,numberofdofspernode_sl,numberofnodes);
                 inputs->Add("surfaceslopey",slopey,numberofdofspernode_sl,numberofnodes);
                 VecFree(&slopex); VecFree(&slopey);
 
-                if(debug)_printf_("%s\n"," computing hutter velocities...");
+                if(verbose)_printf_("%s\n"," computing hutter velocities...");
                 diagnostic_core_linear(&ug,fem_dhu,inputs,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
 
-                if(debug)_printf_("%s\n"," computing pressure according to MacAyeal...");
+                if(verbose)_printf_("%s\n"," computing pressure according to MacAyeal...");
                 ComputePressurex( &pg,fem_dhu->elements,fem_dhu->nodes,fem_dhu->loads,fem_dhu->materials, numberofnodes);
 
-                if(debug)_printf_("%s\n"," update boundary conditions for macyeal pattyn using hutter results...");
+                if(verbose)_printf_("%s\n"," update boundary conditions for macyeal pattyn using hutter results...");
                 if (ismacayealpattyn){
                         VecFree(&fem_dh->yg->vector); VecFree(&fem_dh->ys);VecFree(&fem_dh->ys0);
@@ -125 +125 @@
         if (ismacayealpattyn){
                 
-                if(debug)_printf_("%s\n"," computing horizontal velocities...");
+                if(verbose)_printf_("%s\n"," computing horizontal velocities...");
                 diagnostic_core_nonlinear(&ug,NULL,NULL,fem_dh->loads,fem_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 
                 if(dim==2){
-                        if(debug)_printf_("%s\n"," computing pressure according to MacAyeal...");
+                        if(verbose)_printf_("%s\n"," computing pressure according to MacAyeal...");
                         ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->loads,  fem_dh->materials, numberofnodes);
                 }
@@ -138 +138 @@
         if (dim==3){
 
-                if(debug)_printf_("%s\n"," extruding horizontal velocities...");
+                if(verbose)_printf_("%s\n"," extruding horizontal velocities...");
                 VecDuplicatePatch(&ug_horiz,ug); FieldExtrudex( ug_horiz,fem_dh->elements,fem_dh->nodes, fem_dh->loads,fem_dh->materials,"velocity",1);
 
-                if(debug)_printf_("%s\n"," computing vertical velocities...");
+                if(verbose)_printf_("%s\n"," computing vertical velocities...");
                 inputs->Add("velocity",ug_horiz,numberofdofspernode_dh,numberofnodes);
                 diagnostic_core_linear(&ug_vert,fem_dv,inputs,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 
-                if(debug)_printf_("%s\n"," combining horizontal and vertical velocities...");
+                if(verbose)_printf_("%s\n"," combining horizontal and vertical velocities...");
                 VecFree(&ug); ug=NewVec(numberofnodes*3);
 
@@ -152 +152 @@
                 VecFree(&ug_horiz); VecFree(&ug_vert);
 
-                if(debug)_printf_("%s\n"," computing pressure according to Pattyn...");
+                if(verbose)_printf_("%s\n"," computing pressure according to Pattyn...");
                 ComputePressurex( &pg,fem_dh->elements, fem_dh->nodes, fem_dh->loads,  fem_dh->materials, numberofnodes);
                 
@@ -160 +160 @@
                         VecScale(pg,1.0/stokesreconditioning);
 
-                        if(debug)_printf_("%s\n","computing bed slope (x and y derivatives)...");
+                        if(verbose)_printf_("%s\n","computing bed slope (x and y derivatives)...");
                         diagnostic_core_linear(&slopex,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
                         diagnostic_core_linear(&slopey,fem_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
@@ -178 +178 @@
                         VecFree(&ug_stokes);
 
-                        if(debug)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
+                        if(verbose)_printf_("%s\n"," update boundary conditions for stokes using velocities previously computed...");
                         xfree((void**)&dofset);dofset=dofsetgen(3,dof012,4,numberofnodes*4); VecMerge(fem_ds->yg->vector,ug,dofset,3*numberofnodes);
                         VecFree(&fem_ds->ys); VecFree(&fem_ds->ys0);
                         Reducevectorgtosx(&fem_ds->ys,&fem_ds->ys0, fem_ds->yg->vector,fem_ds->nodesets);
 
-                        if(debug)_printf_("%s\n"," computing stokes velocities and pressure ...");
+                        if(verbose)_printf_("%s\n"," computing stokes velocities and pressure ...");
                         VecFree(&ug);
                         diagnostic_core_nonlinear(&ug,NULL,NULL,NULL,fem_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());

issm/trunk/src/c/parallel/diagnostic_core_linear.cpp

@@ -15 +15 @@
         /*parameters:*/
         int kflag,pflag,connectivity,numberofdofspernode;
-        int debug=0;
+        int verbose=0;
         char* solver_string=NULL;
 
@@ -33 +33 @@
         fem->parameters->FindParam((void*)&connectivity,"connectivity");
         fem->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
-        fem->parameters->FindParam((void*)&debug,"debug");
+        fem->parameters->FindParam((void*)&verbose,"verbose");
         fem->parameters->FindParam((void*)&solver_string,"solverstring");
 
@@ -40 +40 @@
                 
         //*Generate system matrices
-        if (debug) _printf_("   Generating matrices\n");
+        if (verbose) _printf_("   Generating matrices\n");
         SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 
 
-        if (debug) _printf_("   Generating penalty matrices\n");
+        if (verbose) _printf_("   Generating penalty matrices\n");
         //*Generate penalty system matrices
         PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,fem->loads,fem->materials,kflag,pflag,inputs,analysis_type,sub_analysis_type); 
 
         /*!Reduce matrix from g to f size:*/
-        if (debug) _printf_("   reducing matrix from g to f set\n");
+        if (verbose) _printf_("   reducing matrix from g to f set\n");
         Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets); MatFree(&Kgg);
 
 
         /*!Reduce load from g to f size: */
-        if (debug) _printf_("   reducing load from g to f set\n");
+        if (verbose) _printf_("   reducing load from g to f set\n");
         Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);VecFree(&pg); MatFree(&Kfs);
 
         /*Solve: */
-        if (debug) _printf_("   solving\n");
+        if (verbose) _printf_("   solving\n");
         Solverx(&uf, Kff, pf, NULL, solver_string); MatFree(&Kff); VecFree(&pf);
 
         //Merge back to g set
-        if (debug) _printf_("   merging solution from f to g set\n");
+        if (verbose) _printf_("   merging solution from f to g set\n");
         Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf);
 

issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp

@@ -37 +37 @@
         int kflag,pflag,connectivity,numberofdofspernode;
         char* solver_string=NULL;
-        int debug=0;
+        int verbose=0;
         int dofs[4]={1,1,0,0}; //recover vx,vy by default. vz and pressure may be.
 
@@ -46 +46 @@
         fem->FindParam((void*)&numberofnodes,"numberofnodes");
         fem->FindParam((void*)&solver_string,"solverstring");
-
+        fem->FindParam(&verbose,"verbose");
 
         /*Were loads requested as output? : */
@@ -68 +68 @@
         for(;;){
 
-                if (debug) _printf_("   Updating inputs\n");
+                if (verbose) _printf_("   Updating inputs\n");
 
                 /*Set input parameters: */
@@ -81 +81 @@
                 UpdateFromInputsx(fem->elements,fem->nodes,loads, fem->materials,inputs);
 
-                if (debug) _printf_("   Generating matrices\n");
+                if (verbose) _printf_("   Generating matrices\n");
                 //*Generate system matrices
                 SystemMatricesx(&Kgg, &pg,fem->elements,fem->nodes,loads,fem->materials,kflag,pflag,connectivity,numberofdofspernode,inputs,analysis_type,sub_analysis_type); 
 
-                if (debug) _printf_("   Generating penalty matrices\n");
+                if (verbose) _printf_("   Generating penalty matrices\n");
                 //*Generate penalty system matrices
                 PenaltySystemMatricesx(Kgg, pg,NULL,fem->elements,fem->nodes,loads,fem->materials,kflag,pflag,inputs,analysis_type,sub_analysis_type); 
 
-                if (debug) _printf_("   reducing matrix from g to f set\n");
+                if (verbose) _printf_("   reducing matrix from g to f set\n");
                 /*!Reduce matrix from g to f size:*/
                 Reducematrixfromgtofx(&Kff,&Kfs,Kgg,fem->Gmn,fem->nodesets);
@@ -96 +96 @@
                 MatFree(&Kgg);
         
-                if (debug) _printf_("   reducing load from g to f set\n");
+                if (verbose) _printf_("   reducing load from g to f set\n");
                 /*!Reduce load from g to f size: */
                 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
@@ -105 +105 @@
 
                 /*Solve: */
-                if (debug) _printf_("   solving\n");
+                if (verbose) _printf_("   solving\n");
                 Solverx(&uf, Kff, pf, old_uf, solver_string);
 
                 //Merge back to g set
-                if (debug) _printf_("   merging solution from f to g set\n");
+                if (verbose) _printf_("   merging solution from f to g set\n");
                 Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);
 
                 //Deal with penalty loads
-                if (debug) _printf_("   penalty constraints\n");
+                if (verbose) _printf_("   penalty constraints\n");
                 if (old_ug) inputs->Add("old_velocity",old_ug,numberofdofspernode,numberofnodes);
                 inputs->Add("velocity",ug,numberofdofspernode,numberofnodes);
                 PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,loads,fem->materials,inputs,analysis_type,sub_analysis_type); 
 
-                if(debug)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
+                if(verbose)_printf_("   number of unstable constraints: %i\n",num_unstable_constraints);
 
                 /*Figure out if convergence is reached.*/
@@ -133 +133 @@
                 count++;
                 if(converged==1)break;
+                if(count>=100){
+                        _printf_("   maximum number of iterations exceeded\n"); 
+                        break;
+                }
 
         }

issm/trunk/src/c/parallel/gradjcompute_core.cpp

@@ -47 +47 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int dim=-1;
         int extrude_param=0;
@@ -61 +61 @@
         femmodel->parameters->FindParam((void*)&control_type,"control_type");
         femmodel->parameters->FindParam((void*)&extrude_param,"extrude_param");
-        femmodel->parameters->FindParam((void*)&debug,"debug");
+        femmodel->parameters->FindParam((void*)&verbose,"verbose");
         femmodel->parameters->FindParam((void*)&dim,"dim");
 

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

@@ -27 +27 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int numberofdofspernode;
         int numberofnodes;
@@ -40 +40 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
         model->FindParam(&numberofnodes,"numberofnodes");
         model->FindParam(&numberofdofspernode,"numberofdofspernode");

issm/trunk/src/c/parallel/steadystate_core.cpp

@@ -46 +46 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int isstokes=0;
         int numberofnodes;
@@ -64 +64 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&debug,"debug");debug=1;
+        model->FindParam(&verbose,"verbose");verbose=1;
         model->FindParam(&numberofnodes,"numberofnodes");
         model->FindParam(&eps_rel,"eps_rel");
@@ -78 +78 @@
         for(;;){
         
-                if(debug)_printf_("%s%i\n","   computing temperature and velocity for step: ",step);
+                if(verbose)_printf_("%s%i\n","   computing temperature and velocity for step: ",step);
 
                 //first compute temperature at steady state.
@@ -117 +117 @@
                         VecNorm(dt_g,NORM_2,&normdt); VecNorm(old_t_g,NORM_2,&normt);VecFree(&dt_g);
                                         
-                        if (debug) _printf_("%-60s%g\n                                     %s%g\n                                     %s%g%s\n",
+                        if (verbose) _printf_("%-60s%g\n                                     %s%g\n                                     %s%g%s\n",
                                           "      relative convergence criterion: velocity -> norm(du)/norm(u)=   ",ndu/nu*100," temperature -> norm(dt)/norm(t)=",normdt/normt*100," eps_rel:                        ",eps_rel*100," %");
                 

issm/trunk/src/c/parallel/thermal_core.cpp

@@ -37 +37 @@
 
         /*flags: */
-        int    debug=0;
+        int    verbose=0;
         int    numberofdofspernode;
         int    numberofnodes;
@@ -54 +54 @@
         fem_t->FindParam((void*)&numberofnodes,"numberofnodes");
         fem_t->FindParam((void*)&sub_analysis_type,"sub_analysis_type");
-        fem_t->FindParam((void*)&debug,"debug");
+        fem_t->FindParam((void*)&verbose,"verbose");
         fem_t->FindParam((void*)&ndt,"ndt");
         fem_t->FindParam((void*)&dt,"dt");
@@ -67 +67 @@
                 m_g=(Vec*)xmalloc(sizeof(Vec));
 
-                if(debug)_printf_("computing temperatures:\n");
+                if(verbose)_printf_("computing temperatures:\n");
                 thermal_core_nonlinear(&t_g[0],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
                 inputs->Add("temperature",t_g[0],1,numberofnodes);
                 inputs->Add("melting_offset",melting_offset);
                 
-                if(debug)_printf_("computing melting:\n");
+                if(verbose)_printf_("computing melting:\n");
                 diagnostic_core_linear(&m_g[0],fem_m,inputs,MeltingAnalysisEnum(),NoneAnalysisEnum());
         }
@@ -94 +94 @@
 
                 for(i=0;i<nsteps;i++){
-                        if(debug)_printf_("time step: %i/%i\n",i+1,nsteps);
+                        if(verbose)_printf_("time step: %i/%i\n",i+1,nsteps);
                         time[i+1]=(i+1)*dt;
                         
-                        if(debug)_printf_("computing temperatures:\n");
+                        if(verbose)_printf_("computing temperatures:\n");
                         inputs->Add("temperature",t_g[i],1,numberofnodes);
                         thermal_core_nonlinear(&t_g[i+1],&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
                         
-                        if(debug)_printf_("computing melting:\n");
+                        if(verbose)_printf_("computing melting:\n");
                         inputs->Add("temperature",t_g[i+1],1,numberofnodes);
                         inputs->Add("melting_offset",melting_offset);

issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp

@@ -38 +38 @@
         int kflag,pflag,connectivity,numberofdofspernode;
         char* solver_string=NULL;
-        int debug=0;
+        int verbose=0;
         int lowmem=0;
 
@@ -48 +48 @@
         fem->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         fem->parameters->FindParam((void*)&solver_string,"solverstring");
-        fem->parameters->FindParam((void*)&debug,"debug");
+        fem->parameters->FindParam((void*)&verbose,"verbose");
         fem->parameters->FindParam((void*)&lowmem,"lowmem");
         fem->parameters->FindParam((void*)&min_thermal_constraints,"min_thermal_constraints");
@@ -57 +57 @@
         for(;;){
 
-                if(debug)_printf_("%s\n","starting direct shooting method");
+                if(verbose)_printf_("%s\n","starting direct shooting method");
 
                 if(count==1) inputs->Add("reset_penalties",1);
@@ -92 +92 @@
                 MatFree(&Kgg);
         
-                if (debug) _printf_("   reducing load from g to f set\n");
+                if (verbose) _printf_("   reducing load from g to f set\n");
                 /*!Reduce load from g to f size: */
                 Reduceloadfromgtofx(&pf, pg, fem->Gmn, Kfs, fem->ys, fem->nodesets);
@@ -101 +101 @@
 
                 /*Solve: */
-                if(debug)_printf_("%s\n","solving");
+                if(verbose)_printf_("%s\n","solving");
                 VecFree(&tf);
                 Solverx(&tf, Kff, pf,tf_old, solver_string);
@@ -109 +109 @@
                 MatFree(&Kff);VecFree(&pf);VecFree(&tg);
 
-                if (debug) _printf_("   merging solution from f to g set\n");
+                if (verbose) _printf_("   merging solution from f to g set\n");
                 //Merge back to g set
                 Mergesolutionfromftogx(&tg, tf,fem->Gmn,fem->ys,fem->nodesets);
 
                 //Deal with penalty loads
-                if (debug) _printf_("   penalty constraints\n");
+                if (verbose) _printf_("   penalty constraints\n");
                 inputs->Add("temperature",tg,numberofdofspernode,numberofnodes);
                 
@@ -120 +120 @@
 
                 if (!converged){
-                        if(debug)_printf_("%s%i\n","   #unstable constraints = ",num_unstable_constraints);
+                        if(verbose)_printf_("%s%i\n","   #unstable constraints = ",num_unstable_constraints);
                         if (num_unstable_constraints <= min_thermal_constraints)converged=1;
                 }

issm/trunk/src/c/parallel/transient_core_2d.cpp

@@ -56 +56 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int numberofnodes;
 
@@ -75 +75 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
         model->FindParam(&finaltime,"ndt");
         model->FindParam(&dt,"dt");

issm/trunk/src/c/parallel/transient_core_3d.cpp

@@ -60 +60 @@
 
         /*flags: */
-        int debug=0;
+        int verbose=0;
         int numberofnodes;
 
@@ -81 +81 @@
 
         //first recover parameters common to all solutions
-        model->FindParam(&debug,"debug");
+        model->FindParam(&verbose,"verbose");
         model->FindParam(&finaltime,"ndt");
         model->FindParam(&dt,"dt");
@@ -122 +122 @@
         while(time<finaltime){ //make sure we run up to finaltime.
         
-                if(debug)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
+                if(verbose)_printf_("%s%g%s%i%s%g\n","time [yr]: ",time,"    iteration number: ",step,"/",floor(finaltime/dt));
 
                 step+=1;
@@ -136 +136 @@
 
                 //Deal with temperature first 
-                if(debug)_printf_("%s\n","computing temperature");
+                if(verbose)_printf_("%s\n","computing temperature");
                 thermal_core_nonlinear(&t_g,&melting_offset,fem_t,inputs,ThermalAnalysisEnum(),TransientAnalysisEnum());
-                if(debug)_printf_("%s\n","computing melting");
+                if(verbose)_printf_("%s\n","computing melting");
                 inputs->Add("temperature",t_g,1,numberofnodes);
                 inputs->Add("melting_offset",melting_offset);
@@ -144 +144 @@
 
                 //Compute depth averaged temperature and add to inputs
-                if(debug)_printf_("%s\n","computing depth average temperature");
+                if(verbose)_printf_("%s\n","computing depth average temperature");
                 VecDuplicatePatch(&t_g_average,t_g); 
                 FieldDepthAveragex( t_g_average, fem_t->elements,fem_t->nodes, fem_t->loads, fem_t->materials,"temperature");
@@ -160 +160 @@
 
                 //compute new thickness
-                if(debug)_printf_("%s\n","computing new thickness");
+                if(verbose)_printf_("%s\n","computing new thickness");
                 
                 inputs->Add("velocity",u_g,3,numberofnodes);
@@ -170 +170 @@
 
                 //update surface and bed using the new thickness
-                if(debug)_printf_("   updating geometry\n");
+                if(verbose)_printf_("   updating geometry\n");
                 UpdateGeometryx(&h_g,&b_g,&s_g, 
                                 fem_p->elements, fem_p->nodes,fem_p->loads, fem_p->materials, 
@@ -176 +176 @@
                 VecFree(&h_g_intermediary);
                 
-                if(debug)_printf_("%s\n","updating node positions");
+                if(verbose)_printf_("%s\n","updating node positions");
                 UpdateNodePositionsx( fem_dh->elements,fem_dh->nodes,fem_dh->loads,fem_dh->materials,h_g,b_g);
                 UpdateNodePositionsx( fem_dv->elements,fem_dv->nodes,fem_dv->loads,fem_dv->materials,h_g,b_g);

issm/trunk/src/m/classes/@model/model.m

@@ -210 +210 @@
 
         %debugging
-        md.debug=0;
+        md.verbose=0;
         md.element_debug=0;
         md.element_debugid=NaN;

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -85 +85 @@
 %parameter used to print temporary results (convergence criterion,
 %current step,...)
-md.debug=0;
+md.verbose=0;
 
 %Stokes mesh

issm/trunk/src/m/classes/public/display/displaydiagnostic.m

@@ -30 +30 @@
 
 disp(sprintf('\n      %s','Debugging:'));
-fielddisplay(md,'debug','output debug statements when possible yes-> 1, no -> 0. Default is 1');
+fielddisplay(md,'verbose','level of output statements: none -> 0, yes->1,2. Default is 0');
 fielddisplay(md,'element_debug','output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0');
 fielddisplay(md,'element_debugid','if element_debug on, id of element for which to output messages');

issm/trunk/src/m/classes/public/marshall.m

@@ -105 +105 @@
 WriteData(fid,md.meanvel,'Scalar','meanvel');
 WriteData(fid,md.epsvel,'Scalar','epsvel');
-WriteData(fid,md.debug,'Integer','debug');
+WriteData(fid,md.verbose,'Integer','verbose');
 WriteData(fid,md.plot,'Integer','plot');
 WriteData(fid,md.artificial_diffusivity,'Integer','artificial_diffusivity');

issm/trunk/src/m/classes/public/solve.m

@@ -28 +28 @@
 
 %check model consistency
-displaystring(md.debug,'\n%s\n','checking model consistency');
+displaystring(md.verbose,'\n%s\n','checking model consistency');
 ismodelselfconsistent(md),
 
@@ -39 +39 @@
         md=preqmu(md,options);
 end
-displaystring(md.debug,'\n%s\n','launching solution sequence');
+displaystring(md.verbose,'\n%s\n','launching solution sequence');
 
 %If running in parallel, we have a different way of launching the solution
@@ -78 +78 @@
 
 %Check result is consistent
-displaystring(md.debug,'%s\n','checking result consistency');
+displaystring(md.verbose,'%s\n','checking result consistency');
 if ~isresultconsistent(md,options.analysis_type),
         disp('!! results not consistent correct the model !!') %it would be very cruel to put an error, it would kill the computed results (even if not consistent...)

issm/trunk/src/m/classes/public/solveparallel.m

@@ -40 +40 @@
                 %stop timing
                 t2=clock;
-                displaystring(md.debug,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);
+                displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);
 
-                displaystring(md.debug,'loading results from cluster');
+                displaystring(md.verbose,'loading results from cluster');
                 md=loadresultsfromcluster(md);
         end

issm/trunk/src/m/solutions/cielo/ControlInitialization.m

@@ -9 +9 @@
 
 %recover parameters common to all solutions
-debug=m_dhu.parameters.debug;
+verbose=m_dhu.parameters.verbose;
 dim=m_dhu.parameters.dim;
 ishutter=m_dhu.parameters.ishutter;
@@ -24 +24 @@
 
 %compute slopes
-displaystring(debug,'\n%s',['computing bed slope (x and y derivatives)...']);
+displaystring(verbose,'\n%s',['computing bed slope (x and y derivatives)...']);
 slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
 slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
@@ -37 +37 @@
 
 %horizontal velocities
-displaystring(debug,'\n%s',['computing horizontal velocities...']);
+displaystring(verbose,'\n%s',['computing horizontal velocities...']);
 u_g=diagnostic_core_nonlinear(m_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
-displaystring(debug,'\n%s',['extruding horizontal velocities...']);
+displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
 u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,u_g,'velocity',1);
 
 %vertical velocities
-displaystring(debug,'\n%s',['computing vertical velocities...']);
+displaystring(verbose,'\n%s',['computing vertical velocities...']);
 inputs=add(inputs,'velocity',u_g_horiz,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
 u_g_vert=diagnostic_core_linear(m_dv,inputs,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 
 %create 3d u_g
-displaystring(debug,'\n%s',['combining horizontal and vertical velocities...']);
+displaystring(verbose,'\n%s',['combining horizontal and vertical velocities...']);
 u_g=zeros(m_dh.parameters.numberofnodes*3,1);
 u_g(dofsetgen([1,2],3,m_dh.parameters.numberofnodes*3))=u_g_horiz;
@@ -54 +54 @@
 
 % get pressure (reconditionned) and create 4d u_g
-displaystring(debug,'\n%s',['computing pressure according to Pattyn...']);
+displaystring(verbose,'\n%s',['computing pressure according to Pattyn...']);
 p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
 p_g=p_g/m_ds.parameters.stokesreconditioning;
@@ -63 +63 @@
 
 %update BC (spcs)
-displaystring(debug,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
+displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
 m_ds.y_g=zeros(m_ds.nodesets.gsize,1);
 m_ds.y_g(dofsetgen([1,2,3],4,m_ds.nodesets.gsize))=u_g;
@@ -69 +69 @@
 
 %Compute Stokes velocities once to have a reasonably good ug in input
-displaystring(debug,'\n%s',['computing stokes velocities and pressure ...']);
+displaystring(verbose,'\n%s',['computing stokes velocities and pressure ...']);
 u_g=diagnostic_core_nonlinear(m_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
 inputs=add(inputs,'velocity',u_g,'doublevec',4,m_ds.parameters.numberofnodes);

issm/trunk/src/m/solutions/cielo/CreateFemModel.m

@@ -8 +8 @@
 function  m=CreateFEMModel(md)
         
-        displaystring(md.debug,'\n   reading data from model %s...',md.name);
+        displaystring(md.verbose,'\n   reading data from model %s...',md.name);
         [m.elements,m.nodes,m.constraints,m.loads,m.materials,parameters]=ModelProcessor(md);
 
-        displaystring(md.debug,'%s','   generating degrees of freedom...');
+        displaystring(md.verbose,'%s','   generating degrees of freedom...');
         [m.nodes,m.part,m.tpart]=Dof(m.elements,m.nodes,parameters);
 
-        displaystring(md.debug,'%s','   generating single point constraints...');
+        displaystring(md.verbose,'%s','   generating single point constraints...');
         [m.nodes,m.yg]=SpcNodes(m.nodes,m.constraints);
 
-        displaystring(md.debug,'%s','   generating rigid body constraints...');
+        displaystring(md.verbose,'%s','   generating rigid body constraints...');
         [m.Rmg,m.nodes]=MpcNodes(m.nodes,m.constraints);
 
-        displaystring(md.debug,'%s','   generating node sets...');
+        displaystring(md.verbose,'%s','   generating node sets...');
         m.nodesets=BuildNodeSets(m.nodes);
 
-        displaystring(md.debug,'%s','   reducing single point constraints vector...');
+        displaystring(md.verbose,'%s','   reducing single point constraints vector...');
         [m.ys m.ys0]=Reducevectorgtos(m.yg.vector,m.nodesets);
         
-        displaystring(md.debug,'%s','   normalizing rigid body constraints matrix...');
+        displaystring(md.verbose,'%s','   normalizing rigid body constraints matrix...');
         m.Gmn = NormalizeConstraints(m.Rmg,m.nodesets);
 
-        displaystring(md.debug,'%s','   configuring element and loads...');
+        displaystring(md.verbose,'%s','   configuring element and loads...');
         [m.elements,m.loads,m.nodes] = ConfigureObjects( m.elements, m.loads, m.nodes, m.materials);
 
-        displaystring(md.debug,'%s','   processing parameters...');
+        displaystring(md.verbose,'%s','   processing parameters...');
         parameters= ProcessParams(parameters,m.part.vector);
 
-        displaystring(md.debug,'%s','   creating parameters in matlab workspace...');
+        displaystring(md.verbose,'%s','   creating parameters in matlab workspace...');
         m.parameters= ParamsToWorkspace(parameters);
 

issm/trunk/src/m/solutions/cielo/SpawnCore.m

@@ -7 +7 @@
 
 %recover parameters
-debug=models.dh.parameters.debug;
+verbose=models.dh.parameters.verbose;
 parameters=models.dh.parameters;
 responsedescriptors=models.dh.parameters.responsedescriptors; 

issm/trunk/src/m/solutions/cielo/control_core.m

@@ -13 +13 @@
 
 %recover parameters common to all solutions
-debug=model.parameters.debug;
+verbose=model.parameters.verbose;
 dim=model.parameters.dim;
 isstokes=model.parameters.isstokes;
@@ -47 +47 @@
         [model.elements,model.nodes,model.loads,model.materials]=UpdateFromInputs(model.elements,model.nodes,model.loads,model.materials,inputs);
 
-        displaystring(debug,'\n%s',['      computing gradJ...']);
+        displaystring(verbose,'\n%s',['      computing gradJ...']);
         results_grad=gradjcompute_core(models,inputs);
         u_g=results_grad.u_g; c(n).grad_g=results_grad.grad_g;
@@ -60 +60 @@
         end
 
-        displaystring(debug,'\n%s',['      normalizing directions...']);
+        displaystring(verbose,'\n%s',['      normalizing directions...']);
         if n>=2,
                 c(n).grad_g=Orth(c(n).grad_g,c(n-1).grad_g);
@@ -72 +72 @@
         end
 
-        displaystring(debug,'\n%s',['      optimizing along gradient direction...']);
+        displaystring(verbose,'\n%s',['      optimizing along gradient direction...']);
         [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,models,inputs,param_g,c(n).grad_g,n,model.parameters);
 
-        displaystring(debug,'\n%s',['      updating parameter using optimized search scalar...']);
+        displaystring(verbose,'\n%s',['      updating parameter using optimized search scalar...']);
         param_g=param_g+search_scalar*model.parameters.optscal(n)*c(n).grad_g;
 
-        displaystring(debug,'\n%s',['      constraining the new distribution...']);
+        displaystring(verbose,'\n%s',['      constraining the new distribution...']);
         param_g=ControlConstrain(param_g,model.parameters);
 
@@ -95 +95 @@
                                         %convergence if convergence criteria fullfilled
                                         convergence=1;
-                                        displaystring(debug,'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(c(i).J-c(n).J)/c(n).J,'<',eps_cm);
+                                        displaystring(verbose,'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(c(i).J-c(n).J)/c(n).J,'<',eps_cm);
                                 else
-                                        displaystring(debug,'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(c(i).J-c(n).J)/c(n).J,'>',eps_cm);
+                                        displaystring(verbose,'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(c(i).J-c(n).J)/c(n).J,'>',eps_cm);
                                 end
                                 break;
@@ -110 +110 @@
 
 %generate output
-displaystring(debug,'\n%s',['      preparing final velocity solution...']);
+displaystring(verbose,'\n%s',['      preparing final velocity solution...']);
 
 %compute final velocity from diagnostic_core (horiz+vertical)

issm/trunk/src/m/solutions/cielo/convergence.m

@@ -2 +2 @@
 
 %Get convergence options
-debug=params.debug;
+verbose=params.verbose;
 yts=params.yts;
 eps_res=params.eps_res;
@@ -10 +10 @@
 %initialization
 converged=0;
-displaystring(debug,' ');
+displaystring(verbose,' ');
 
 %Display solver caracteristics
-if (debug>1),
+if (verbose>1),
         solver_res=norm(K_ff*u_f-p_f,2)/norm(p_f,2);
-        displaystring(debug>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
-        displaystring(debug>1,'%s%g','      solver residue: norm(KU-F)/norm(F)=',solver_res);
+        displaystring(verbose>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
+        displaystring(verbose>1,'%s%g','      solver residue: norm(KU-F)/norm(F)=',solver_res);
 end
 
@@ -25 +25 @@
 end
 if (res<=eps_res),
-        displaystring(debug,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',eps_res*100,' %');
+        displaystring(verbose,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' < ',eps_res*100,' %');
         converged=1;
 else
-        displaystring(debug,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
+        displaystring(verbose,'%-60s%g%s%g%s','      mechanical equilibrium convergence criterion',res*100,' > ',eps_res*100,' %');
         converged=0;
 end
 
 %Relative criterion (optional)
-if ((~isnan(eps_rel)) | (debug>1)),
+if ((~isnan(eps_rel)) | (verbose>1)),
 
         %compute ndu/nu
@@ -46 +46 @@
         if ~isnan(eps_rel),
                 if (ndu/nu<=eps_rel),
-                        displaystring(debug,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
+                        displaystring(verbose,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' < ',eps_rel*100,' %');
                 else
-                        displaystring(debug,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');
+                        displaystring(verbose,'%-60s%g%s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' > ',eps_rel*100,' %');
                         converged=0;
                 end
         else
-                displaystring(debug,'%-60s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' %');
+                displaystring(verbose,'%-60s%g%s','      relative convergence criterion: norm(du)/norm(u)',ndu/nu*100,' %');
         end
 
@@ -58 +58 @@
 
 %Absolute criterion (optional)
-if ((~isnan(eps_abs)) | (debug>1)),
+if ((~isnan(eps_abs)) | (verbose>1)),
 
         %compute max(du)
@@ -70 +70 @@
         if ~isnan(eps_abs),
                 if (nduinf<=eps_abs),
-                        displaystring(debug,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',eps_abs,' m/yr');
+                        displaystring(verbose,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' < ',eps_abs,' m/yr');
                 else
-                        displaystring(debug,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',eps_abs,' m/yr');
+                        displaystring(verbose,'%-60s%g%s%g%s','      absolute convergence criterion: max(du)',nduinf,' > ',eps_abs,' m/yr');
                         converged=0;
                 end
         else
-                displaystring(debug,'%-60s%g%s','      absolute convergence criterion: max(du)',nduinf,' m/yr');
+                displaystring(verbose,'%-60s%g%s','      absolute convergence criterion: max(du)',nduinf,' m/yr');
         end
 

issm/trunk/src/m/solutions/cielo/diagnostic.m

@@ -12 +12 @@
         models.analysis_type=DiagnosticAnalysisEnum; %needed for processresults
         
-        displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
+        displaystring(md.verbose,'%s',['reading diagnostic horiz model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HorizAnalysisEnum; models.dh=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic vert model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=VertAnalysisEnum; models.dv=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic stokes model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=StokesAnalysisEnum; models.ds=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic hutter model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HutterAnalysisEnum; models.dhu=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
+        displaystring(md.verbose,'\n%s',['reading surface and bed slope computation model data']);
         md.analysis_type=SlopeComputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
         
@@ -62 +62 @@
         %stop timing
         t2=clock;
-        displaystring(md.debug,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);
+        displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);

issm/trunk/src/m/solutions/cielo/diagnostic_core.m

@@ -14 +14 @@
 
 %recover parameters common to all solutions
-debug=m_dhu.parameters.debug;
+verbose=m_dhu.parameters.verbose;
 dim=m_dh.parameters.dim;
 ishutter=m_dhu.parameters.ishutter;
@@ -23 +23 @@
 if ishutter,
 
-        displaystring(debug,'\n%s',['computing surface slope (x and y derivatives)...']);
+        displaystring(verbose,'\n%s',['computing surface slope (x and y derivatives)...']);
         slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceXAnalysisEnum());
         slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceYAnalysisEnum());
 
         if dim==3,
-                displaystring(debug,'\n%s',['extruding slopes in 3d...']);
+                displaystring(verbose,'\n%s',['extruding slopes in 3d...']);
                 slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopex,'slopex',0);
                 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey,'slopey',0);
         end
 
-        displaystring(debug,'\n%s',['computing slopes...']);
+        displaystring(verbose,'\n%s',['computing slopes...']);
         inputs=add(inputs,'surfaceslopex',slopex,'doublevec',m_sl.parameters.numberofdofspernode,m_sl.parameters.numberofnodes);
         inputs=add(inputs,'surfaceslopey',slopey,'doublevec',m_sl.parameters.numberofdofspernode,m_sl.parameters.numberofnodes);
 
-        displaystring(debug,'\n%s',['computing hutter velocities...']);
+        displaystring(verbose,'\n%s',['computing hutter velocities...']);
         u_g=diagnostic_core_linear(m_dhu,inputs,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
 
-        displaystring(debug,'\n%s',['computing pressure according to MacAyeal...']);
+        displaystring(verbose,'\n%s',['computing pressure according to MacAyeal...']);
         p_g=ComputePressure(m_dhu.elements,m_dhu.nodes,m_dhu.loads,m_dhu.materials,m_dhu.parameters,inputs);
 
-        displaystring(debug,'\n%s',['update boundary conditions for macyeal pattyn using hutter results...']);
+        displaystring(verbose,'\n%s',['update boundary conditions for macyeal pattyn using hutter results...']);
         if ismacayealpattyn,
                 m_dh.y_g=u_g;
@@ -53 +53 @@
 if ismacayealpattyn,
 
-        displaystring(debug,'\n%s',['computing horizontal velocities...']);
+        displaystring(verbose,'\n%s',['computing horizontal velocities...']);
         [u_g m_dh.loads]=diagnostic_core_nonlinear(m_dh,inputs,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
 
-        displaystring(debug,'\n%s',['computing pressure according to MacAyeal...']);
+        displaystring(verbose,'\n%s',['computing pressure according to MacAyeal...']);
         p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
 end
@@ -62 +62 @@
 if dim==3,
 
-        displaystring(debug,'\n%s',['extruding horizontal velocities...']);
+        displaystring(verbose,'\n%s',['extruding horizontal velocities...']);
         u_g_horiz=FieldExtrude(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,u_g,'velocity',1);
 
-        displaystring(debug,'\n%s',['computing vertical velocities...']);
+        displaystring(verbose,'\n%s',['computing vertical velocities...']);
         inputs=add(inputs,'velocity',u_g_horiz,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
         u_g_vert=diagnostic_core_linear(m_dv,inputs,DiagnosticAnalysisEnum(),VertAnalysisEnum());
 
-        displaystring(debug,'\n%s',['combining horizontal and vertical velocities...']);
+        displaystring(verbose,'\n%s',['combining horizontal and vertical velocities...']);
         u_g=zeros(m_dh.parameters.numberofnodes*3,1);
         u_g(dofsetgen([1,2],3,m_dh.parameters.numberofnodes*3))=u_g_horiz;
         u_g(dofsetgen([3],3,m_dh.parameters.numberofnodes*3))=u_g_vert;
 
-        displaystring(debug,'\n%s',['computing pressure according to Pattyn...']);
+        displaystring(verbose,'\n%s',['computing pressure according to Pattyn...']);
         p_g=ComputePressure(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,m_dh.parameters,inputs);
         
@@ -82 +82 @@
                 p_g=p_g/m_ds.parameters.stokesreconditioning;
 
-                displaystring(debug,'\n%s',['computing bed slope (x and y derivatives)...']);
+                displaystring(verbose,'\n%s',['computing bed slope (x and y derivatives)...']);
                 slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
                 slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
@@ -98 +98 @@
                 inputs=add(inputs,'velocity',u_g_stokes,'doublevec',4,m_ds.parameters.numberofnodes);
 
-                displaystring(debug,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
+                displaystring(verbose,'\n%s',['update boundary conditions for stokes using velocities previously computed...']);
                 m_ds.y_g=zeros(m_ds.nodesets.gsize,1);
                 m_ds.y_g(dofsetgen([1,2,3],4,m_ds.nodesets.gsize))=u_g;
                 [m_ds.ys m_ds.ys0]=Reducevectorgtos(m_ds.y_g,m_ds.nodesets);
 
-                displaystring(debug,'\n%s',['computing stokes velocities and pressure ...']);
+                displaystring(verbose,'\n%s',['computing stokes velocities and pressure ...']);
                 u_g=diagnostic_core_nonlinear(m_ds,inputs,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
         

issm/trunk/src/m/solutions/cielo/diagnostic_core_linear.m

@@ -17 +17 @@
         %Reduce tangent matrix from g size to f size
         [K_ff, K_fs] = Reducematrixfromgtof( K_gg, m.Gmn, m.nodesets); 
-        displaystring(m.parameters.debug>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
+        displaystring(m.parameters.verbose>1,'%s%g','      condition number of stiffness matrix: ',condest(K_ff));
         
         %Reduce load from g size to f size

issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m

@@ -16 +16 @@
         inputs=add(inputs,'converged',converged,'double');
 
-        displaystring(m.parameters.debug,'\n%s',['   starting direct shooting method']);
+        displaystring(m.parameters.verbose,'\n%s',['   starting direct shooting method']);
         while(~converged),
                 
@@ -57 +57 @@
                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes, loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
         
-                displaystring(m.parameters.debug,'%s%i','      number of unstable constraints: ',num_unstable_constraints);
+                displaystring(m.parameters.verbose,'%s%i','      number of unstable constraints: ',num_unstable_constraints);
 
                 %Figure out if convergence have been reached

issm/trunk/src/m/solutions/cielo/gradjcompute_core.m

@@ -5 +5 @@
 
 %recover parameters
-debug=m.parameters.debug;
+verbose=m.parameters.verbose;
 dim=m.parameters.dim;
 extrude_param=m.parameters.extrude_param;
@@ -15 +15 @@
 
 %Recover solution for this stiffness and right hand side: 
-displaystring(debug,'%s','         computing velocities...');
+displaystring(verbose,'%s','         computing velocities...');
 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
 inputs=add(inputs,'velocity',u_g,'doublevec',m.parameters.numberofdofspernode,m.parameters.numberofnodes);
@@ -21 +21 @@
 
 %Buid Du, difference between observed velocity and model velocity.
-displaystring(debug,'%s','          computing Du...');
+displaystring(verbose,'%s','          computing Du...');
 [Du_g]=Du(m.elements,m.nodes,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
 
@@ -28 +28 @@
 
 %Solve for adjoint vector: 
-displaystring(debug,'%s','          computing adjoint state...');
+displaystring(verbose,'%s','          computing adjoint state...');
 lambda_f=Solver(K_ff0,Du_f,[],m.parameters);
 
@@ -38 +38 @@
 grad_g=Gradj(m.elements,m.nodes,m.loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
 if (dim==3 & extrude_param),
-        displaystring(debug,'%s','          extruding gradient...');
+        displaystring(verbose,'%s','          extruding gradient...');
         grad_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,grad_g,'gradj',0);
 end
@@ -44 +44 @@
 if m.parameters.control_steady,
         %compute initial velocity from diagnostic_core (horiz+vertical)
-        displaystring(debug,'%s','          compute 3d initial velocity...');
+        displaystring(verbose,'%s','          compute 3d initial velocity...');
         results_diag=diagnostic_core(models,inputs);
         u_g=results_diag.u_g;

issm/trunk/src/m/solutions/cielo/prognostic.m

@@ -11 +11 @@
         models.analysis_type=PrognosticAnalysisEnum; %needed for processresults
         
-        displaystring(md.debug,'%s',['reading prognostic model data']);
+        displaystring(md.verbose,'%s',['reading prognostic model data']);
         md.analysis_type=PrognosticAnalysisEnum; models.p=CreateFemModel(md);
 
@@ -18 +18 @@
 
         %initialize inputs
-        displaystring(md.debug,'\n%s',['setup inputs...']);
+        displaystring(md.verbose,'\n%s',['setup inputs...']);
         inputs=inputlist;
         inputs=add(inputs,'velocity',models.p.parameters.u_g,'doublevec',3,models.p.parameters.numberofnodes);
@@ -26 +26 @@
         inputs=add(inputs,'dt',models.p.parameters.dt*models.p.parameters.yts,'double');
 
-        displaystring(md.debug,'\n%s',['call computational core:']);
+        displaystring(md.verbose,'\n%s',['call computational core:']);
         results=prognostic_core(models,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
 
-        displaystring(md.debug,'\n%s',['load results...']);
+        displaystring(md.verbose,'\n%s',['load results...']);
         if ~isstruct(md.results), md.results=struct(); end
         md.results.prognostic=processresults(models, results);
@@ -35 +35 @@
         %stop timing
         t2=clock;
-        displaystring(md.debug,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);   
+        displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']); 

issm/trunk/src/m/solutions/cielo/prognostic_core.m

@@ -10 +10 @@
         results.step=1;
 
-        displaystring(m.parameters.debug,'\n%s',['depth averaging velocity...']);
+        displaystring(m.parameters.verbose,'\n%s',['depth averaging velocity...']);
         %Take only the first two dofs of m.parameters.u_g
         u_g=get(inputs,'velocity',[1 1 0 0]);
@@ -16 +16 @@
         inputs=add(inputs,'velocity_average',u_g,'doublevec',2,m.parameters.numberofnodes);
 
-        displaystring(m.parameters.debug,'\n%s',['call computational core:']);
+        displaystring(m.parameters.verbose,'\n%s',['call computational core:']);
         results.h_g=diagnostic_core_linear(m,inputs,analysis_type,sub_analysis_type);
 
-        displaystring(m.parameters.debug,'\n%s',['extrude computed thickness on all layers:']);
+        displaystring(m.parameters.verbose,'\n%s',['extrude computed thickness on all layers:']);
         results.h_g=FieldExtrude(m.elements,m.nodes,m.loads,m.materials,results.h_g,'thickness',0);
 

issm/trunk/src/m/solutions/cielo/steadystate.m

@@ -12 +12 @@
         
         %Build all models requested for diagnostic simulation
-        displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
+        displaystring(md.verbose,'%s',['reading diagnostic horiz model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HorizAnalysisEnum; models.dh=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic vert model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=VertAnalysisEnum; models.dv=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic stokes model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=StokesAnalysisEnum; models.ds=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
+        displaystring(md.verbose,'\n%s',['reading diagnostic hutter model data']);
         md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HutterAnalysisEnum; models.dhu=CreateFemModel(md);
         
-        displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
+        displaystring(md.verbose,'\n%s',['reading surface and bed slope computation model data']);
         md.analysis_type=SlopeComputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
 
         %Build all models requested for thermal simulation
-        displaystring(md.debug,'%s',['reading thermal model data']);
+        displaystring(md.verbose,'%s',['reading thermal model data']);
         md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.t=CreateFemModel(md);
 
-        displaystring(md.debug,'%s',['reading melting model data']);
+        displaystring(md.verbose,'%s',['reading melting model data']);
         md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.m=CreateFemModel(md);
 
@@ -38 +38 @@
 
         %initialize inputs
-        displaystring(md.debug,'\n%s',['setup inputs...']);
+        displaystring(md.verbose,'\n%s',['setup inputs...']);
         inputs=inputlist;
         inputs=add(inputs,'velocity',models.dh.parameters.u_g,'doublevec',3,models.dh.parameters.numberofnodes);
@@ -75 +75 @@
         %stop timing
         t2=clock;
-        displaystring(md.debug,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);
+        displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);

issm/trunk/src/m/solutions/cielo/steadystate_core.m

@@ -16 +16 @@
 
 %recover parameters common to all solutions
-debug=m_dhu.parameters.debug;
+verbose=m_dhu.parameters.verbose;
 dim=m_dhu.parameters.dim;
 eps_rel=m_dhu.parameters.eps_rel;
@@ -36 +36 @@
 while(~converged),
         
-        displaystring(debug,'%s%i','computing temperature and velocity for step ',step);
+        displaystring(verbose,'%s%i','computing temperature and velocity for step ',step);
         
         %first compute temperature at steady state.
@@ -65 +65 @@
         t_g_old=results_thermal.t_g;
         
-        displaystring(debug,'%-60s%g\n                                     %s%g\n                                     %s%g%s',...
+        displaystring(verbose,'%-60s%g\n                                     %s%g\n                                     %s%g%s',...
                       '      relative convergence criterion: velocity -> norm(du)/norm(u)=   ',ndu/nu*100,' temperature -> norm(dt)/norm(t)=',ndt/nt*100,' eps_rel:                        ',eps_rel*100,' %');
         if (ndu/nu<=eps_rel)  & (ndt/nt<=eps_rel),

issm/trunk/src/m/solutions/cielo/thermal.m

@@ -11 +11 @@
 
         %Build all models requested for diagnostic simulation
-        displaystring(md.debug,'%s',['reading thermal model data']);
+        displaystring(md.verbose,'%s',['reading thermal model data']);
         md.analysis_type=ThermalAnalysisEnum(); models.t=CreateFemModel(md);
 
-        displaystring(md.debug,'%s',['reading melting model data']);
+        displaystring(md.verbose,'%s',['reading melting model data']);
         md.analysis_type=MeltingAnalysisEnum(); models.m=CreateFemModel(md);
 
@@ -21 +21 @@
 
         %initialize inputs
-        displaystring(md.debug,'\n%s',['setup inputs...']);
+        displaystring(md.verbose,'\n%s',['setup inputs...']);
         inputs=inputlist;
         inputs=add(inputs,'velocity',models.t.parameters.u_g,'doublevec',3,models.t.parameters.numberofnodes);
@@ -42 +42 @@
         %stop timing
         t2=clock;
-        displaystring(md.debug,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']);   
+        displaystring(md.verbose,'\n%s\n',['solution converged in ' num2str(etime(t2,t1)) ' seconds']); 

issm/trunk/src/m/solutions/cielo/thermal_core.m

@@ -14 +14 @@
         results.step=1;
 
-        displaystring(m_t.parameters.debug,'\n%s',['computing temperatures...']);
+        displaystring(m_t.parameters.verbose,'\n%s',['computing temperatures...']);
         [results.t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
 
-        displaystring(m_t.parameters.debug,'\n%s',['computing melting...']);
+        displaystring(m_t.parameters.verbose,'\n%s',['computing melting...']);
         inputs=add(inputs,'melting_offset',melting_offset,'double');
         inputs=add(inputs,'temperature',results.t_g,'doublevec',1,m_t.parameters.numberofnodes);
@@ -37 +37 @@
         for n=1:nsteps, 
 
-                displaystring(m_t.parameters.debug,'\n%s%i/%i\n','time step: ',n,nsteps);
+                displaystring(m_t.parameters.verbose,'\n%s%i/%i\n','time step: ',n,nsteps);
                 results(n+1).step=n+1;
                 results(n+1).time=n*m_t.parameters.dt;
 
-                displaystring(m_t.parameters.debug,'\n%s',['    computing temperatures...']);
+                displaystring(m_t.parameters.verbose,'\n%s',['    computing temperatures...']);
                 inputs=add(inputs,'temperature',results(n).t_g,'doublevec',1,m_t.parameters.numberofnodes);
                 [results(n+1).t_g m_t.loads melting_offset]=thermal_core_nonlinear(m_t,inputs,ThermalAnalysisEnum(),NoneAnalysisEnum());
 
-                displaystring(m_t.parameters.debug,'\n%s',['    computing melting...']);
+                displaystring(m_t.parameters.verbose,'\n%s',['    computing melting...']);
                 inputs=add(inputs,'temperature',results(n+1).t_g,'doublevec',1,m_t.parameters.numberofnodes);
                 inputs=add(inputs,'melting_offset',melting_offset,'double');

issm/trunk/src/m/solutions/cielo/thermal_core_nonlinear.m

@@ -18 +18 @@
         m.parameters.kflag=1; m.parameters.pflag=1;
 
-        displaystring(m.parameters.debug,'\n%s',['   starting direct shooting method']);
+        displaystring(m.parameters.verbose,'\n%s',['   starting direct shooting method']);
         
         while(~converged),
@@ -28 +28 @@
                 if ~m.parameters.lowmem 
                         if count==1
-                                displaystring(m.parameters.debug,'%s',['   system matrices']);
+                                displaystring(m.parameters.verbose,'%s',['   system matrices']);
                                 [K_gg_nopenalty, p_g_nopenalty]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
                         end
-                        displaystring(m.parameters.debug,'%s',['   penalty system matrices']);
+                        displaystring(m.parameters.verbose,'%s',['   penalty system matrices']);
                         [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg_nopenalty,p_g_nopenalty,m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
                 else
-                        displaystring(m.parameters.debug,'%s',['   system matrices']);
+                        displaystring(m.parameters.verbose,'%s',['   system matrices']);
                         [K_gg , p_g]=SystemMatrices(m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
-                        displaystring(m.parameters.debug,'%s',['   penalty system matrices']);
+                        displaystring(m.parameters.verbose,'%s',['   penalty system matrices']);
                         [K_gg , p_g, melting_offset]=PenaltySystemMatrices(K_gg,p_g,m.elements,m.nodes,loads,m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
                 end
@@ -47 +47 @@
 
                 %Solve  
-                displaystring(m.parameters.debug,'%s%g','   condition number of stiffness matrix: ',condest(K_ff));
+                displaystring(m.parameters.verbose,'%s%g','   condition number of stiffness matrix: ',condest(K_ff));
                 [t_f]=Solver(K_ff,p_f,[],m.parameters);
 
                 %Merge back to g set
-                displaystring(m.parameters.debug,'%s',['   merging solution back to g set']);
+                displaystring(m.parameters.verbose,'%s',['   merging solution back to g set']);
                 [t_g]= Mergesolutionfromftog( t_f, m.Gmn, m.ys, m.nodesets ); 
 
                 %Update inputs in datasets
                 inputs=add(inputs,'temperature',t_g,'doublevec',m.parameters.numberofdofspernode,m.parameters.numberofnodes);
-                displaystring(m.parameters.debug,'%s',['   update inputs']);
+                displaystring(m.parameters.verbose,'%s',['   update inputs']);
                 [m.elements,m.nodes, loads,m.materials]=UpdateFromInputs(m.elements,m.nodes, loads,m.materials,inputs);
         
                 %penalty constraints
-                displaystring(m.parameters.debug,'%s',['   penalty constraints']);
+                displaystring(m.parameters.verbose,'%s',['   penalty constraints']);
                 [loads,constraints_converged,num_unstable_constraints] =PenaltyConstraints( m.elements,m.nodes, loads, m.materials,m.parameters,inputs,analysis_type,sub_analysis_type);
         
                 if ~converged,
-                        displaystring(m.parameters.debug,'%s%i','   #unstable constraints ',num_unstable_constraints);
+                        displaystring(m.parameters.verbose,'%s%i','   #unstable constraints ',num_unstable_constraints);
                         
                         if num_unstable_constraints<=m.parameters.min_thermal_constraints,

issm/trunk/src/m/solutions/cielo/transient2d.m

@@ -10 +10 @@
 models.analysis_type='transient'; %needed for processresults
 
-displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
+displaystring(md.verbose,'%s',['reading diagnostic horiz model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=HorizAnalysisEnum(); models.dh=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic vert model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=VertAnalysisEnum(); models.dv=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic stokes model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=StokesAnalysisEnum(); models.ds=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic hutter model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=HutterAnalysisEnum(); models.dhu=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
+displaystring(md.verbose,'\n%s',['reading surface and bed slope computation model data']);
 md.analysis_type=SlopeComputeAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.sl=CreateFemModel(md);
 
-displaystring(md.debug,'%s',['reading prognostic model data']);
+displaystring(md.verbose,'%s',['reading prognostic model data']);
 md.analysis_type=PrognosticAnalysisEnum(); models.p=CreateFemModel(md);
 
@@ -39 +39 @@
 
 %initialize inputs
-displaystring(md.debug,'\n%s',['setup inputs...']);
+displaystring(md.verbose,'\n%s',['setup inputs...']);
 inputs=inputlist;
 inputs=add(inputs,'velocity',solution.u_g,'doublevec',2,models.p.parameters.numberofnodes);

issm/trunk/src/m/solutions/cielo/transient3d.m

@@ -10 +10 @@
 models.analysis_type=TransientAnalysisEnum(); %needed for processresults
 
-displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
+displaystring(md.verbose,'%s',['reading diagnostic horiz model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=HorizAnalysisEnum(); models.dh=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic vert model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=VertAnalysisEnum(); models.dv=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic stokes model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=StokesAnalysisEnum(); models.ds=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
+displaystring(md.verbose,'\n%s',['reading diagnostic hutter model data']);
 md.analysis_type=DiagnosticAnalysisEnum(); md.sub_analysis_type=HutterAnalysisEnum(); models.dhu=CreateFemModel(md);
 
-displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
+displaystring(md.verbose,'\n%s',['reading surface and bed slope computation model data']);
 md.analysis_type=SlopeComputeAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.sl=CreateFemModel(md);
 
-displaystring(md.debug,'%s',['reading prognostic model data']);
+displaystring(md.verbose,'%s',['reading prognostic model data']);
 md.analysis_type=PrognosticAnalysisEnum(); models.p=CreateFemModel(md);
 
 %Build all models related to thermal
-displaystring(md.debug,'%s',['reading thermal model data']);
+displaystring(md.verbose,'%s',['reading thermal model data']);
 md.analysis_type=ThermalAnalysisEnum(); models.t=CreateFemModel(md);
 
-displaystring(md.debug,'%s',['reading melting model data']);
+displaystring(md.verbose,'%s',['reading melting model data']);
 md.analysis_type=MeltingAnalysisEnum(); models.m=CreateFemModel(md);
 
@@ -51 +51 @@
 
 %initialize inputs
-displaystring(md.debug,'\n%s',['setup inputs...']);
+displaystring(md.verbose,'\n%s',['setup inputs...']);
 inputs=inputlist;
 inputs=add(inputs,'velocity',results.u_g,'doublevec',3,models.p.parameters.numberofnodes);
@@ -70 +70 @@
 while  time<finaltime+dt, %make sure we run up to finaltime.
 
-        displaystring(md.debug,'\n%s%g%s%g%s%g\n','time [yr]: ',time,'    iteration number: ',n,'/',floor(finaltime/dt));
+        displaystring(md.verbose,'\n%s%g%s%g%s%g\n','time [yr]: ',time,'    iteration number: ',n,'/',floor(finaltime/dt));
 
         results(n+1).step=n+1;
@@ -84 +84 @@
 
         %Deal with temperature first 
-        displaystring(md.debug,'\n%s',['    computing temperatures...']);
+        displaystring(md.verbose,'\n%s',['    computing temperatures...']);
         [results(n+1).t_g models.t.loads melting_offset]=thermal_core_nonlinear(models.t,inputs,ThermalAnalysisEnum(),TransientAnalysisEnum());
         inputs=add(inputs,'temperature',results(n+1).t_g,'doublevec',1,models.t.parameters.numberofnodes);
         
-        displaystring(md.debug,'\n%s',['    computing melting...']);
+        displaystring(md.verbose,'\n%s',['    computing melting...']);
         inputs=add(inputs,'melting_offset',melting_offset,'double');
         results(n+1).m_g=diagnostic_core_linear(models.m,inputs,MeltingAnalysisEnum(),TransientAnalysisEnum());
@@ -101 +101 @@
 
         %compute new thickness
-        displaystring(md.debug,'\n%s',['    computing new thickness...']);
+        displaystring(md.verbose,'\n%s',['    computing new thickness...']);
         inputs=add(inputs,'velocity',results(n+1).u_g,'doublevec',3,models.p.parameters.numberofnodes);
         rawresults=prognostic_core(models,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
@@ -107 +107 @@
 
         %update surface and bed using the new thickness
-        displaystring(md.debug,'\n%s',['    updating geometry...']);
+        displaystring(md.verbose,'\n%s',['    updating geometry...']);
         [new_thickness,new_bed,new_surface]=UpdateGeometry(models.p.elements,models.p.nodes,models.p.loads,models.p.materials,models.p.parameters,new_thickness,results(n).b_g,results(n).s_g);
 
@@ -116 +116 @@
 
         %figure out if time stepping is good
-        %displaystring(md.debug,'   checking time stepping...'));
+        %displaystring(md.verbose,'   checking time stepping...'));
         %[back,dt,time]=TimeStepping(md,results,dt,time);
         %if back,
@@ -123 +123 @@
 
         %update node positions
-        displaystring(md.debug,'\n%s',['    updating node positions...']);
+        displaystring(md.verbose,'\n%s',['    updating node positions...']);
         models.dh.nodes=UpdateNodePositions(models.dh.elements,models.dh.nodes,models.dh.loads,models.dh.materials,new_bed,new_thickness);
         models.dv.nodes=UpdateNodePositions(models.dv.elements,models.dv.nodes,models.dv.loads,models.dv.materials,new_bed,new_thickness);

issm/trunk/src/m/solutions/dakota/preqmu.m

@@ -20 +20 @@
 global ISSM_DIR;
 
-displaystring(md.debug,'\n%s\n','preprocessing dakota inputs');
+displaystring(md.verbose,'\n%s\n','preprocessing dakota inputs');
 
 %first create temporary directory in which we will work

issm/trunk/src/m/utils/BC/SetIceSheetBC.m

@@ -37 +37 @@
 end
 
-displaystring(md.debug,'%s',['      boundary conditions for prognostic model initialization']);
+displaystring(md.verbose,'%s',['      boundary conditions for prognostic model initialization']);
 md.spcthickness=zeros(md.numberofgrids,2);
 
 if (length(md.observed_temperature)==md.numberofgrids),
-        displaystring(md.debug,'%s',['      boundary conditions for thermal model']);
+        displaystring(md.verbose,'%s',['      boundary conditions for thermal model']);
         md.spctemperature=[md.gridonsurface md.observed_temperature]; %impose observed temperature on surface
         if (length(md.geothermalflux)~=md.numberofgrids),

issm/trunk/src/m/utils/BC/SetIceShelfBC.m

@@ -55 +55 @@
 end
 
-displaystring(md.debug,'%s',['      boundary conditions for prognostic model initialization']);
+displaystring(md.verbose,'%s',['      boundary conditions for prognostic model initialization']);
 md.spcthickness=zeros(md.numberofgrids,2);
 
 if (length(md.observed_temperature)==md.numberofgrids),
-        displaystring(md.debug,'%s',['      boundary conditions for thermal model']);
+        displaystring(md.verbose,'%s',['      boundary conditions for thermal model']);
         md.spctemperature=[md.gridonsurface md.observed_temperature]; %impose observed temperature on surface
         if (length(md.geothermalflux)~=md.numberofgrids),

issm/trunk/src/m/utils/BC/SetMarineIceSheetBC.m

@@ -67 +67 @@
 end
 
-displaystring(md.debug,'%s',['      boundary conditions for prognostic model initialization']);
+displaystring(md.verbose,'%s',['      boundary conditions for prognostic model initialization']);
 md.spcthickness=zeros(md.numberofgrids,2);
 
 if (length(md.observed_temperature)==md.numberofgrids),
-        displaystring(md.debug,'%s',['      boundary conditions for thermal model']);
+        displaystring(md.verbose,'%s',['      boundary conditions for thermal model']);
         md.spctemperature=[md.gridonsurface md.observed_temperature]; %impose observed temperature on surface
         if (length(md.geothermalflux)~=md.numberofgrids),

issm/trunk/src/m/utils/String/displaystring.m

@@ -1 @@
-function displaystring(debug,format,varargin)
+function displaystring(flag,format,varargin)
 %DISPLAY -  display string in solution sequences. wrapper to disp and sprintf.  
 %
 %   Usage:
-%      displaystring(debug,format,string)
-%      debug can be used to switch display on and off
+%      displaystring(flag,format,string)
+%      flag can be used to switch display on and off
 %
 %   Example:
 %      display(1,'%s\n','string to display');
         
-if debug,
+if flag,
         disp(sprintf(format,varargin{:}));
 end