Changeset 25680


Ignore:
Timestamp:
10/12/20 09:50:51 (4 years ago)
Author:
Mathieu Morlighem
Message:

CHG: better handling of prints

Location:
issm/trunk-jpl/src/c
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp

    r25539 r25680  
    6969
    7070        if(save_results){
    71                 if(VerboseSolution()) _printf0_("   saving results\n");
    7271                femmodel->RequestedOutputsx(&femmodel->results,&extvar_enum,1);
    7372        }

  • issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

    r25539 r25680  
    168168
    169169        if(save_results){
    170                 if(VerboseSolution()) _printf0_("   saving levelset results\n");
    171170                int outputs[1] = {MaskIceLevelsetEnum};
    172171                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);

  • issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

    r25611 r25680  
    10501050
    10511051        if(isFS && !(isSSA || isHO || isL1L2 || isMLHO)){
    1052                 if(VerboseSolution()) _printf0_("   computing velocities\n");
    1053 
    10541052                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
    10551053
    … …  
    10751073        }
    10761074        else if(!isFS && (isSSA || isHO || isL1L2 || isMLHO)){
    1077                 if(VerboseSolution()) _printf0_("   computing velocities\n");
    1078 
    10791075                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
    10801076                if(newton>0)

  • issm/trunk-jpl/src/c/cores/adjointbalancethickness2_core.cpp

    r22178 r25680  
    3333        /*Save results*/
    3434        if(save_results || true){
    35                 if(VerboseSolution()) _printf0_("   saving results\n");
    3635                int outputs[1] = {AdjointEnum};
    3736                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);

  • issm/trunk-jpl/src/c/cores/adjointbalancethickness_core.cpp

    r16518 r25680  
    3333        /*Save results*/
    3434        if(save_results){
    35                 if(VerboseSolution()) _printf0_("   saving results\n");
    3635                int outputs[1] = {AdjointEnum};
    3736                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);

  • issm/trunk-jpl/src/c/cores/balancethickness2_core.cpp

    r22830 r25680  
    3333
    3434        if(save_results){
    35                 if(VerboseSolution()) _printf0_("   saving results\n");
    3635                const int numoutputs = 1;
    3736                int outputs[numoutputs] = {ThicknessEnum};

  • issm/trunk-jpl/src/c/cores/balancethickness_core.cpp

    r25239 r25680  
    3636
    3737        if(save_results){
    38                 if(VerboseSolution()) _printf0_("   saving results\n");
    3938                int outputs = ThicknessEnum;
    4039                femmodel->RequestedOutputsx(&femmodel->results,&outputs,1);

  • issm/trunk-jpl/src/c/cores/balancevelocity_core.cpp

    r23380 r25680  
    3232
    3333        if(save_results){
    34                 if(VerboseSolution()) _printf0_("   saving results\n");
    3534                int outputs[3] = {DrivingStressXEnum,DrivingStressYEnum,VelEnum};
    3635                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);

  • issm/trunk-jpl/src/c/cores/bedslope_core.cpp

    r24240 r25680  
    3434
    3535        if(save_results){
    36                 if(VerboseSolution()) _printf0_("   saving bedslopes results\n");
    3736                if(domaintype!=Domain2DverticalEnum){
    3837                        int outputs[2] = {BedSlopeXEnum,BedSlopeYEnum};

  • issm/trunk-jpl/src/c/cores/damage_core.cpp

    r24240 r25680  
    4040
    4141        if(save_results){
    42                 if(VerboseSolution()) _printf0_("   saving damage results\n");
    4342                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    4443        }

  • issm/trunk-jpl/src/c/cores/depthaverage_core.cpp

    r21799 r25680  
    1616        int inputenum,input_average_enum;
    1717
    18         if(VerboseSolution()) _printf0_("   depth averaging solution...\n");
    19 
    2018        /*Get parameters*/
    2119        femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
    … …  
    3028        }
    3129
     30        if(VerboseSolution()) _printf0_("   depth averaging "<<EnumToStringx(inputenum)<<"\n");
     31
    3232        /*Special method for Penta, otherwise call solution sequence*/
    3333        if(elementtype==PentaEnum){

  • issm/trunk-jpl/src/c/cores/esa_core.cpp

    r25465 r25680  
    9999
    100100                if(save_results){
    101                         if(VerboseSolution()) _printf0_("   saving results\n");
    102101                        femmodel->parameters->FindParam(&requested_outputs,&numoutputs,EsaRequestedOutputsEnum);
    103102                        femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);

  • issm/trunk-jpl/src/c/cores/extrudefrombase_core.cpp

    r21799 r25680  
    1515        int elementtype,domaintype;
    1616
    17         if(VerboseSolution()) _printf0_("   extruding solution from base...\n");
    18 
    1917        /*Get parameters*/
    2018        femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
    … …  
    2422        if(domaintype==Domain2DhorizontalEnum) return;
    2523
     24        int inputenum;
     25        femmodel->parameters->FindParam(&inputenum,InputToExtrudeEnum);
     26        if(VerboseSolution()) _printf0_("   extruding "<<EnumToStringx(inputenum)<<" from base...\n");
     27
    2628        /*Special method for Penta, otherwise call solution sequence*/
    2729        if(elementtype==PentaEnum){
    28                 int inputenum; femmodel->parameters->FindParam(&inputenum,InputToExtrudeEnum);
    2930                InputExtrudex(femmodel,inputenum,-1);
    3031        }

  • issm/trunk-jpl/src/c/cores/gia_core.cpp

    r25379 r25680  
    5858
    5959                if(save_results){
    60                         if(VerboseSolution()) _printf0_("   saving results\n");
    6160                        int outputs[2] = {UGiaEnum,UGiaRateEnum};
    6261                        femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);

  • issm/trunk-jpl/src/c/cores/groundingline_core.cpp

    r25465 r25680  
    2222
    2323        /*Move grounding line*/
     24        if(VerboseSolution()) _printf0_("   computing new grounding line position\n");
    2425        GroundinglineMigrationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    2526
    … …  
    3334
    3435        if(save_results){
    35                 if(VerboseSolution()) _printf0_("   saving groundingline results\n");
    3636                int outputs[3] = {SurfaceEnum,BaseEnum,MaskOceanLevelsetEnum};
    3737                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3);

  • issm/trunk-jpl/src/c/cores/hydrology_core.cpp

    r25489 r25680  
    187187        }
    188188        if(save_results){
    189                 if(VerboseSolution()) _printf0_("   saving hydrology results \n");
    190189                if(hydrology_model==HydrologydcEnum && ThawedNodes==0){
    191190                        if(VerboseSolution()) _printf0_("   No thawed node hydro is skiped \n");}

  • issm/trunk-jpl/src/c/cores/masstransport_core.cpp

    r24490 r25680  
    8585
    8686        if(save_results){
    87                 if(VerboseSolution()) _printf0_("   saving results\n");
    8887                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    8988        }

  • issm/trunk-jpl/src/c/cores/movingfront_core.cpp

    r25241 r25680  
    4848        }
    4949
     50
    5051        /* start the work from here */
     52        if(VerboseSolution()) _printf0_("   computing calving and undercutting\n");
    5153        Calvingx(femmodel);
    5254        FrontalForcingsx(femmodel);
    53         if(VerboseSolution()) _printf0_("   computing level set transport\n");
     55        if(VerboseSolution()) _printf0_("   computing new ice front position\n");
    5456
    5557        /* smoothen slope of lsf for computation of normal on ice domain*/

  • issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp

    r25627 r25680  
    6565                int     numoutputs;
    6666                char **requested_outputs = NULL;
    67 
    68                 if(VerboseSolution()) _printf0_("   saving results\n");
    6967                femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SealevelriseRequestedOutputsEnum);
    7068                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);

  • issm/trunk-jpl/src/c/cores/smb_core.cpp

    r24790 r25680  
    103103
    104104        if(save_results){
    105                 if(VerboseSolution()) _printf0_("   saving smb results\n");
    106105                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    107106        }

  • issm/trunk-jpl/src/c/cores/steadystate_core.cpp

    r22886 r25680  
    7878
    7979        if(save_results){
    80                 if(VerboseSolution()) _printf0_("   saving results\n");
    8180                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    8281        }

  • issm/trunk-jpl/src/c/cores/stressbalance_core.cpp

    r25514 r25680  
    9494
    9595        if(save_results){
    96                 if(VerboseSolution()) _printf0_("   saving stressbalance results\n");
    9796                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    98                 if(VerboseSolution()) _printf0_("   results saved\n");
    9997        }
    10098

  • issm/trunk-jpl/src/c/cores/surfaceslope_core.cpp

    r24240 r25680  
    3838
    3939        if(save_results){
    40                 if(VerboseSolution()) _printf0_("saving surface slopes results:\n");
    4140                if(domaintype!=Domain2DverticalEnum){
    4241                        int outputs[2] = {SurfaceSlopeXEnum,SurfaceSlopeYEnum};

  • issm/trunk-jpl/src/c/cores/thermal_core.cpp

    r24335 r25680  
    5050
    5151        if(save_results){
    52                 if(VerboseSolution()) _printf0_("   saving thermal results\n");
    5352                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    5453        }

  • issm/trunk-jpl/src/c/cores/transient_core.cpp

    r25637 r25680  
    190190        /* Using Hydrology dc  coupled we need to compute smb in the hydrology inner time loop*/
    191191        if(issmb) {
    192                 if(VerboseSolution()) _printf0_("   computing smb\n");
    193192                smb_core(femmodel);
    194193        }
    195194
    196195        if(ishydrology){
    197                 if(VerboseSolution()) _printf0_("   computing hydrology\n");
    198196                int hydrology_model;
    199197                hydrology_core(femmodel);
    … …  
    203201
    204202        if(isstressbalance && (step%sb_coupling_frequency==0 || step==1) ) {
    205                 if(VerboseSolution()) _printf0_("   computing stress balance\n");
    206203                stressbalance_core(femmodel);
    207204        }
    208205
    209206        if(isdamageevolution) {
    210                 if(VerboseSolution()) _printf0_("   computing damage\n");
    211207                damage_core(femmodel);
    212208        }
    213209
    214210        if(ismovingfront)       {
    215                 if(VerboseSolution()) _printf0_("   computing moving front\n");
    216211                movingfront_core(femmodel);
    217212        }
    … …  
    220215
    221216        if(ismasstransport){
    222                 if(VerboseSolution()) _printf0_("   computing mass transport\n");
    223217                bmb_core(femmodel);
    224218                masstransport_core(femmodel);
    … …  
    227221
    228222        if(isgroundingline){
    229                 if(VerboseSolution()) _printf0_("   computing new grounding line position\n");
    230223                groundingline_core(femmodel);
    231224        }
    232225
    233226        if(isgia){
    234                 if(VerboseSolution()) _printf0_("   computing glacial isostatic adjustment\n");
    235227                #ifdef _HAVE_GIA_
    236228                gia_core(femmodel);
    … …  
    461453                delete hdl_setadjoint;
    462454
     455                if(VerboseSolution()) _printf0_("   computing gradient\n");
    463456                tape_codi.evaluate();
    464457
Note: See TracChangeset for help on using the changeset viewer.