Changeset 18138


Ignore:
Timestamp:
06/11/14 11:47:09 (11 years ago)
Author:
Mathieu Morlighem
Message:

CHG: do not need to call another time forward run after gradient

Location:
issm/trunk-jpl
Files:
15 edited

Legend:

Unmodified
Added
Removed

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

    r18137 r18138  
    252252        }
    253253
    254         /*Needed for output results (FIXME: should be placed 6 lines below)*/
    255         ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
    256 
    257254        for(long i=0;i<nsize;i++){
    258255                if(X[i]>=XU[i]) G[i]=0.;
    … …  
    260257        }
    261258
    262         /*solve forward: (FIXME: not needed actually...)*/
    263         switch(solution_type){
    264                 case SteadystateSolutionEnum:
    265                         femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
    266                         stressbalance_core(femmodel);   //We need a 3D velocity!! (vz is required for the next thermal run)
    267                         break;
    268                 case StressbalanceSolutionEnum:
    269                         femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
    270                         solutionsequence_nonlinear(femmodel,conserve_loads);
    271                         break;
    272                 case BalancethicknessSolutionEnum:
    273                         femmodel->SetCurrentConfiguration(BalancethicknessAnalysisEnum);
    274                         solutionsequence_linear(femmodel);
    275                         break;
    276                 case BalancethicknessSoftSolutionEnum:
    277                         /*NOTHING*/
    278                         break;
    279                 case Balancethickness2SolutionEnum:
    280                         femmodel->SetCurrentConfiguration(Balancethickness2AnalysisEnum);
    281                         solutionsequence_linear(femmodel);
    282                         break;
    283                 default:
    284                         _error_("Solution " << EnumToStringx(solution_type) << " not implemented yet");
    285         }
     259        /*Needed for output results*/
     260        ControlInputSetGradientx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,G);
    286261
    287262        /*Compute misfit for this velocity field.*/
Note: See TracChangeset for help on using the changeset viewer.