Index: /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp (revision 2329) +++ /issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp (revision 2330) @@ -71,7 +71,7 @@ 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); Index: /issm/trunk/src/c/ModelProcessorx/IoModel.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/IoModel.cpp (revision 2329) +++ /issm/trunk/src/c/ModelProcessorx/IoModel.cpp (revision 2330) @@ -119,5 +119,5 @@ iomodel->mincontrolconstraint=0; iomodel->maxcontrolconstraint=0; - iomodel->debug=0; + iomodel->verbose=0; iomodel->plot=0; iomodel->eps_res=0; @@ -329,5 +329,5 @@ 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); Index: /issm/trunk/src/c/ModelProcessorx/IoModel.h =================================================================== --- /issm/trunk/src/c/ModelProcessorx/IoModel.h (revision 2329) +++ /issm/trunk/src/c/ModelProcessorx/IoModel.h (revision 2330) @@ -117,5 +117,5 @@ double mincontrolconstraint; double maxcontrolconstraint; - int debug; + int verbose; int plot; double eps_res; Index: /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp =================================================================== --- /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp (revision 2329) +++ /issm/trunk/src/c/Qmux/SpawnCoreParallel.cpp (revision 2330) @@ -50,5 +50,5 @@ double* qmu_part=NULL; int qmu_npart; - int debug=0; + int verbose=0; extern int my_rank; @@ -59,5 +59,5 @@ /*some parameters needed: */ - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); /*First off, recover the response descriptors for the response functions: */ @@ -146,5 +146,5 @@ if(analysis_type==DiagnosticAnalysisEnum()){ - if(debug)_printf_("Starting diagnostic core\n"); + if(verbose)_printf_("Starting diagnostic core\n"); diagnostic_core(results,model,inputs); @@ -153,5 +153,5 @@ 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,5 +159,5 @@ 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,5 +165,5 @@ 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,10 +174,10 @@ /*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); Index: /issm/trunk/src/c/parallel/ControlInitialization.cpp =================================================================== --- /issm/trunk/src/c/parallel/ControlInitialization.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/ControlInitialization.cpp (revision 2330) @@ -34,5 +34,5 @@ /*flags: */ - int debug=0; + int verbose=0; int dim=-1; int ishutter=0; @@ -54,5 +54,5 @@ /*first recover parameters common to all solutions:*/ - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); model->FindParam(&dim,"dim"); model->FindParam(&ishutter,"ishutter"); @@ -83,5 +83,5 @@ //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,16 +97,16 @@ //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,5 +115,5 @@ //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,5 +127,5 @@ //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,5 +134,5 @@ //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()); Index: /issm/trunk/src/c/parallel/control_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/control_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/control_core.cpp (revision 2330) @@ -52,5 +52,5 @@ int sub_analysis_type; int control_steady; - int debug=0; + int verbose=0; int convergence=0; int numberofnodes; Index: /issm/trunk/src/c/parallel/convergence.cpp =================================================================== --- /issm/trunk/src/c/parallel/convergence.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/convergence.cpp (revision 2330) @@ -30,5 +30,5 @@ double eps_rel; double eps_abs; - int debug; + int verbose; double yts; @@ -38,8 +38,8 @@ 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,14 +81,14 @@ //print if(res ",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,8 +104,8 @@ if (!isnan(eps_rel)){ if((ndu/nu) ",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,5 +116,5 @@ /*Absolute criterion (Optional) = max(du)*/ - if (!isnan(eps_abs) || (debug>1)){ + if (!isnan(eps_abs) || (verbose>1)){ //compute max(du) @@ -129,8 +129,8 @@ if (!isnan(eps_abs)){ if ((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; } Index: /issm/trunk/src/c/parallel/diagnostic_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/diagnostic_core.cpp (revision 2330) @@ -39,5 +39,5 @@ /*flags: */ - int debug=0; + int verbose=0; int qmu_analysis=0; int dim=-1; @@ -62,5 +62,5 @@ //first recover parameters common to all solutions - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); model->FindParam(&dim,"dim"); model->FindParam(&ishutter,"ishutter"); @@ -92,5 +92,5 @@ 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,21 +98,21 @@ 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,9 +125,9 @@ 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,12 +138,12 @@ 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,5 +152,5 @@ 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,5 +160,5 @@ 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,10 +178,10 @@ 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()); Index: /issm/trunk/src/c/parallel/diagnostic_core_linear.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic_core_linear.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/diagnostic_core_linear.cpp (revision 2330) @@ -15,5 +15,5 @@ /*parameters:*/ int kflag,pflag,connectivity,numberofdofspernode; - int debug=0; + int verbose=0; char* solver_string=NULL; @@ -33,5 +33,5 @@ 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,26 +40,26 @@ //*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); Index: /issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/diagnostic_core_nonlinear.cpp (revision 2330) @@ -37,5 +37,5 @@ 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,5 +46,5 @@ fem->FindParam((void*)&numberofnodes,"numberofnodes"); fem->FindParam((void*)&solver_string,"solverstring"); - + fem->FindParam(&verbose,"verbose"); /*Were loads requested as output? : */ @@ -68,5 +68,5 @@ for(;;){ - if (debug) _printf_(" Updating inputs\n"); + if (verbose) _printf_(" Updating inputs\n"); /*Set input parameters: */ @@ -81,13 +81,13 @@ 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,5 +96,5 @@ 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,18 +105,18 @@ /*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,4 +133,8 @@ count++; if(converged==1)break; + if(count>=100){ + _printf_(" maximum number of iterations exceeded\n"); + break; + } } Index: /issm/trunk/src/c/parallel/gradjcompute_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/gradjcompute_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/gradjcompute_core.cpp (revision 2330) @@ -47,5 +47,5 @@ /*flags: */ - int debug=0; + int verbose=0; int dim=-1; int extrude_param=0; @@ -61,5 +61,5 @@ 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"); Index: /issm/trunk/src/c/parallel/prognostic_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/prognostic_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/prognostic_core.cpp (revision 2330) @@ -27,5 +27,5 @@ /*flags: */ - int debug=0; + int verbose=0; int numberofdofspernode; int numberofnodes; @@ -40,5 +40,5 @@ //first recover parameters common to all solutions - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); model->FindParam(&numberofnodes,"numberofnodes"); model->FindParam(&numberofdofspernode,"numberofdofspernode"); Index: /issm/trunk/src/c/parallel/steadystate_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/steadystate_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/steadystate_core.cpp (revision 2330) @@ -46,5 +46,5 @@ /*flags: */ - int debug=0; + int verbose=0; int isstokes=0; int numberofnodes; @@ -64,5 +64,5 @@ //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,5 +78,5 @@ 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,5 +117,5 @@ 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," %"); Index: /issm/trunk/src/c/parallel/thermal_core.cpp =================================================================== --- /issm/trunk/src/c/parallel/thermal_core.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/thermal_core.cpp (revision 2330) @@ -37,5 +37,5 @@ /*flags: */ - int debug=0; + int verbose=0; int numberofdofspernode; int numberofnodes; @@ -54,5 +54,5 @@ 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,10 +67,10 @@ 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,12 +94,12 @@ for(i=0;iAdd("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); Index: /issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp =================================================================== --- /issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/thermal_core_nonlinear.cpp (revision 2330) @@ -38,5 +38,5 @@ int kflag,pflag,connectivity,numberofdofspernode; char* solver_string=NULL; - int debug=0; + int verbose=0; int lowmem=0; @@ -48,5 +48,5 @@ 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,5 +57,5 @@ 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,5 +92,5 @@ 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,5 +101,5 @@ /*Solve: */ - if(debug)_printf_("%s\n","solving"); + if(verbose)_printf_("%s\n","solving"); VecFree(&tf); Solverx(&tf, Kff, pf,tf_old, solver_string); @@ -109,10 +109,10 @@ 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,5 +120,5 @@ 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; } Index: /issm/trunk/src/c/parallel/transient_core_2d.cpp =================================================================== --- /issm/trunk/src/c/parallel/transient_core_2d.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/transient_core_2d.cpp (revision 2330) @@ -56,5 +56,5 @@ /*flags: */ - int debug=0; + int verbose=0; int numberofnodes; @@ -75,5 +75,5 @@ //first recover parameters common to all solutions - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); model->FindParam(&finaltime,"ndt"); model->FindParam(&dt,"dt"); Index: /issm/trunk/src/c/parallel/transient_core_3d.cpp =================================================================== --- /issm/trunk/src/c/parallel/transient_core_3d.cpp (revision 2329) +++ /issm/trunk/src/c/parallel/transient_core_3d.cpp (revision 2330) @@ -60,5 +60,5 @@ /*flags: */ - int debug=0; + int verbose=0; int numberofnodes; @@ -81,5 +81,5 @@ //first recover parameters common to all solutions - model->FindParam(&debug,"debug"); + model->FindParam(&verbose,"verbose"); model->FindParam(&finaltime,"ndt"); model->FindParam(&dt,"dt"); @@ -122,5 +122,5 @@ while(timeAdd("temperature",t_g,1,numberofnodes); inputs->Add("melting_offset",melting_offset); @@ -144,5 +144,5 @@ //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,5 +160,5 @@ //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,5 +170,5 @@ //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,5 +176,5 @@ 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); Index: /issm/trunk/src/m/classes/@model/model.m =================================================================== --- /issm/trunk/src/m/classes/@model/model.m (revision 2329) +++ /issm/trunk/src/m/classes/@model/model.m (revision 2330) @@ -210,5 +210,5 @@ %debugging - md.debug=0; + md.verbose=0; md.element_debug=0; md.element_debugid=NaN; Index: /issm/trunk/src/m/classes/@model/setdefaultparameters.m =================================================================== --- /issm/trunk/src/m/classes/@model/setdefaultparameters.m (revision 2329) +++ /issm/trunk/src/m/classes/@model/setdefaultparameters.m (revision 2330) @@ -85,5 +85,5 @@ %parameter used to print temporary results (convergence criterion, %current step,...) -md.debug=0; +md.verbose=0; %Stokes mesh Index: /issm/trunk/src/m/classes/public/display/displaydiagnostic.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaydiagnostic.m (revision 2329) +++ /issm/trunk/src/m/classes/public/display/displaydiagnostic.m (revision 2330) @@ -30,5 +30,5 @@ 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'); Index: /issm/trunk/src/m/classes/public/marshall.m =================================================================== --- /issm/trunk/src/m/classes/public/marshall.m (revision 2329) +++ /issm/trunk/src/m/classes/public/marshall.m (revision 2330) @@ -105,5 +105,5 @@ 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'); Index: /issm/trunk/src/m/classes/public/solve.m =================================================================== --- /issm/trunk/src/m/classes/public/solve.m (revision 2329) +++ /issm/trunk/src/m/classes/public/solve.m (revision 2330) @@ -28,5 +28,5 @@ %check model consistency -displaystring(md.debug,'\n%s\n','checking model consistency'); +displaystring(md.verbose,'\n%s\n','checking model consistency'); ismodelselfconsistent(md), @@ -39,5 +39,5 @@ 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,5 +78,5 @@ %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...) Index: /issm/trunk/src/m/classes/public/solveparallel.m =================================================================== --- /issm/trunk/src/m/classes/public/solveparallel.m (revision 2329) +++ /issm/trunk/src/m/classes/public/solveparallel.m (revision 2330) @@ -40,7 +40,7 @@ %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 Index: /issm/trunk/src/m/solutions/cielo/ControlInitialization.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/ControlInitialization.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/ControlInitialization.m (revision 2330) @@ -9,5 +9,5 @@ %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,5 +24,5 @@ %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,16 +37,16 @@ %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,5 +54,5 @@ % 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,5 +63,5 @@ %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,5 +69,5 @@ %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); Index: /issm/trunk/src/m/solutions/cielo/CreateFemModel.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/CreateFemModel.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/CreateFemModel.m (revision 2330) @@ -8,32 +8,32 @@ 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); Index: /issm/trunk/src/m/solutions/cielo/SpawnCore.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/SpawnCore.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/SpawnCore.m (revision 2330) @@ -7,5 +7,5 @@ %recover parameters -debug=models.dh.parameters.debug; +verbose=models.dh.parameters.verbose; parameters=models.dh.parameters; responsedescriptors=models.dh.parameters.responsedescriptors; Index: /issm/trunk/src/m/solutions/cielo/control_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/control_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/control_core.m (revision 2330) @@ -13,5 +13,5 @@ %recover parameters common to all solutions -debug=model.parameters.debug; +verbose=model.parameters.verbose; dim=model.parameters.dim; isstokes=model.parameters.isstokes; @@ -47,5 +47,5 @@ [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,5 +60,5 @@ 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,11 +72,11 @@ 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,7 +95,7 @@ %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,5 +110,5 @@ %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) Index: /issm/trunk/src/m/solutions/cielo/convergence.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/convergence.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/convergence.m (revision 2330) @@ -2,5 +2,5 @@ %Get convergence options -debug=params.debug; +verbose=params.verbose; yts=params.yts; eps_res=params.eps_res; @@ -10,11 +10,11 @@ %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,13 +25,13 @@ 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,11 +46,11 @@ 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,5 +58,5 @@ %Absolute criterion (optional) -if ((~isnan(eps_abs)) | (debug>1)), +if ((~isnan(eps_abs)) | (verbose>1)), %compute max(du) @@ -70,11 +70,11 @@ 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 Index: /issm/trunk/src/m/solutions/cielo/diagnostic.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/diagnostic.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/diagnostic.m (revision 2330) @@ -12,17 +12,17 @@ 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,3 +62,3 @@ %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']); Index: /issm/trunk/src/m/solutions/cielo/diagnostic_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/diagnostic_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/diagnostic_core.m (revision 2330) @@ -14,5 +14,5 @@ %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,25 +23,25 @@ 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,8 +53,8 @@ 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,17 +62,17 @@ 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,5 +82,5 @@ 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,10 +98,10 @@ 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()); Index: /issm/trunk/src/m/solutions/cielo/diagnostic_core_linear.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/diagnostic_core_linear.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/diagnostic_core_linear.m (revision 2330) @@ -17,5 +17,5 @@ %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 Index: /issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/diagnostic_core_nonlinear.m (revision 2330) @@ -16,5 +16,5 @@ 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,5 +57,5 @@ [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 Index: /issm/trunk/src/m/solutions/cielo/gradjcompute_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/gradjcompute_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/gradjcompute_core.m (revision 2330) @@ -5,5 +5,5 @@ %recover parameters -debug=m.parameters.debug; +verbose=m.parameters.verbose; dim=m.parameters.dim; extrude_param=m.parameters.extrude_param; @@ -15,5 +15,5 @@ %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,5 +21,5 @@ %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,5 +28,5 @@ %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,5 +38,5 @@ 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,5 +44,5 @@ 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; Index: /issm/trunk/src/m/solutions/cielo/prognostic.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/prognostic.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/prognostic.m (revision 2330) @@ -11,5 +11,5 @@ 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,5 +18,5 @@ %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,8 +26,8 @@ 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,3 +35,3 @@ %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']); Index: /issm/trunk/src/m/solutions/cielo/prognostic_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/prognostic_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/prognostic_core.m (revision 2330) @@ -10,5 +10,5 @@ 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,8 +16,8 @@ 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); Index: /issm/trunk/src/m/solutions/cielo/steadystate.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/steadystate.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/steadystate.m (revision 2330) @@ -12,24 +12,24 @@ %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,5 +38,5 @@ %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,3 +75,3 @@ %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']); Index: /issm/trunk/src/m/solutions/cielo/steadystate_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/steadystate_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/steadystate_core.m (revision 2330) @@ -16,5 +16,5 @@ %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,5 +36,5 @@ 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,5 +65,5 @@ 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), Index: /issm/trunk/src/m/solutions/cielo/thermal.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/thermal.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/thermal.m (revision 2330) @@ -11,8 +11,8 @@ %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,5 +21,5 @@ %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,3 +42,3 @@ %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']); Index: /issm/trunk/src/m/solutions/cielo/thermal_core.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/thermal_core.m (revision 2330) @@ -14,8 +14,8 @@ 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,13 +37,13 @@ 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'); Index: /issm/trunk/src/m/solutions/cielo/thermal_core_nonlinear.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/thermal_core_nonlinear.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/thermal_core_nonlinear.m (revision 2330) @@ -18,5 +18,5 @@ 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,13 +28,13 @@ 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,22 +47,22 @@ %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, Index: /issm/trunk/src/m/solutions/cielo/transient2d.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/transient2d.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/transient2d.m (revision 2330) @@ -10,20 +10,20 @@ 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,5 +39,5 @@ %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); Index: /issm/trunk/src/m/solutions/cielo/transient3d.m =================================================================== --- /issm/trunk/src/m/solutions/cielo/transient3d.m (revision 2329) +++ /issm/trunk/src/m/solutions/cielo/transient3d.m (revision 2330) @@ -10,27 +10,27 @@ 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,5 +51,5 @@ %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,5 +70,5 @@ while time