Changeset 3941


Ignore:
Timestamp:
05/25/10 11:58:52 (15 years ago)
Author:
Mathieu Morlighem
Message:

Added InputToResults for all cores EXCEPT steadystate and transient

Location:
issm/trunk/src/c/solutions
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/c/solutions/balancedthickness2_core.cpp

    r3938 r3941  
    1717        /*output: */
    1818        Results* results=NULL;
     19        Result* result=NULL;
    1920
    2021        /*intermediary: */
    … …  
    6768
    6869        /*Plug results into output dataset: */
    69         results->AddObject(new Result(results->Size()+1,0,1,"h_g",h_g));
    70 
    71         /*Add analysis_type to results: */
     70        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1); results->AddObject(result);
    7271        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(Balancedthickness2AnalysisEnum)));
    7372

  • issm/trunk/src/c/solutions/balancedthickness_core.cpp

    r3938 r3941  
    1717        /*output: */
    1818        Results* results=NULL;
     19        Result* result=NULL;
    1920
    2021        /*intermediary: */
    … …  
    5758
    5859        /*Plug results into output dataset: */
    59         results->AddObject(new Result(results->Size()+1,0,1,"h_g",h_g));
    60 
    61         /*Add analysis_type to results: */
     60        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1); results->AddObject(result);
    6261        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(BalancedthicknessAnalysisEnum)));
    6362

  • issm/trunk/src/c/solutions/balancedvelocities_core.cpp

    r3938 r3941  
    1616        /*output: */
    1717        Results* results=NULL;
     18        Result* result=NULL;
    1819
    1920        /*intermediary: */
    … …  
    5657
    5758        /*Plug results into output dataset: */
    58         results->AddObject(new Result(results->Size()+1,0,1,"v_g",v_g));
    59 
    60         /*Add analysis_type to results: */
     59        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,VxEnum,results->Size()+1,0,1); results->AddObject(result);
     60        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,VyEnum,results->Size()+1,0,1); results->AddObject(result);
    6161        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(BalancedvelocitiesAnalysisEnum)));
    6262

  • issm/trunk/src/c/solutions/diagnostic_core_linear.cpp

    r3913 r3941  
    5555        Mergesolutionfromftogx(&ug, uf,fem->Gmn,fem->ys,fem->nodesets);VecFree(&uf);
    5656
     57        //Update inputs using new solution:
     58        UpdateInputsFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug,analysis_type, sub_analysis_type);
     59
    5760        /*free ressources: */
    5861        xfree((void**)&solver_string);

  • issm/trunk/src/c/solutions/gradjcompute_core.cpp

    r3938 r3941  
    1919        FemModel* femmodel=NULL;
    2020        Results* diagnostic_results=NULL;
     21        Result*  result=NULL;
    2122        int analysis_type;
    2223        int sub_analysis_type;
    … …  
    117118
    118119        /*Plug results into output dataset: */
    119         results->AddObject(new Result(results->Size()+1,0,1,"grad_g",grad_g));
     120        InputToResultx(&result,femmodel->elements,femmodel->nodes,femmodel->vertices, femmodel->loads, femmodel->materials,femmodel->parameters,GradientAnalysisEnum,results->Size()+1,0,1); results->AddObject(result);
    120121        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(GradientAnalysisEnum)));
    121122       

  • issm/trunk/src/c/solutions/prognostic2_core.cpp

    r3938 r3941  
    1616        /*output: */
    1717        Results* results=NULL;
     18        Result* result=NULL;
    1819
    1920        /*intermediary: */
    … …  
    5960
    6061        /*Plug results into output dataset: */
    61         results->AddObject(new Result(results->Size()+1,0,1,"h_g",h_g));
     62        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1); results->AddObject(result);
     63        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(Prognostic2AnalysisEnum)));
    6264
    6365        /*Free ressources:*/
    … …  
    6567        VecFree(&vy_g);
    6668        VecFree(&h_g);
    67 
    68         /*Add analysis_type to results: */
    69         results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(Prognostic2AnalysisEnum)));
    7069       
    7170        /*return: */

  • issm/trunk/src/c/solutions/prognostic_core.cpp

    r3938 r3941  
    5050       
    5151        _printf_("extract result from extruded inputs: \n");
    52         InputToResultx(&result,fem_p->elements,fem_p->nodes, fem_p->vertices,fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1);
    53         results->AddObject(result);
    54 
    55         /*Add analysis_type to results: */
     52        InputToResultx(&result,fem_p->elements,fem_p->nodes,fem_p->vertices, fem_p->loads, fem_p->materials,fem_p->parameters,ThicknessEnum,results->Size()+1,0,1); results->AddObject(result);
    5653        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(PrognosticAnalysisEnum)));
    5754

  • issm/trunk/src/c/solutions/slopecompute_core.cpp

    r3938 r3941  
    1616        /*output: */
    1717        Results* results=NULL;
     18        Result * result =NULL;
    1819
    1920        /*solutions: */
    … …  
    5051
    5152        /*Plug results into output dataset: */
    52         results->AddObject(new Result(results->Size()+1,0,1,"sx_g",sx_g));
    53         results->AddObject(new Result(results->Size()+1,0,1,"sy_g",sy_g));
     53        InputToResultx(&result,fem_sl->elements,fem_sl->nodes,fem_sl->vertices, fem_sl->loads, fem_sl->materials,fem_sl->parameters,SurfaceXAnalysisEnum,results->Size()+1,0,1); results->AddObject(result);
     54        InputToResultx(&result,fem_sl->elements,fem_sl->nodes,fem_sl->vertices, fem_sl->loads, fem_sl->materials,fem_sl->parameters,SurfaceYAnalysisEnum,results->Size()+1,0,1); results->AddObject(result);
    5455        results->AddObject(new StringResult(results->Size()+1,AnalysisTypeEnum,0,1,EnumAsString(SlopecomputeAnalysisEnum)));
    55 
    5656
    5757        /*Free ressources:*/

  • issm/trunk/src/c/solutions/thermal_core.cpp

    r3938 r3941  
    2121        /*output: */
    2222        Results* results=NULL;
     23        Result*  result=NULL;
    2324
    2425        /*solutions vectors: */
    … …  
    100101        /*Plug results into output dataset: */
    101102        if(dt==0){
    102                 results->AddObject(new Result(results->Size()+1,0,1,"t_g",t_g[0]));
    103                 results->AddObject(new Result(results->Size()+1,0,1,"m_g",m_g[0]));
     103                InputToResultx(&result,fem_t->elements,fem_t->nodes,fem_t->vertices, fem_t->loads, fem_t->materials,fem_t->parameters,TemperatureEnum,results->Size()+1,0,1); results->AddObject(result);
     104                InputToResultx(&result,fem_m->elements,fem_m->nodes,fem_m->vertices, fem_m->loads, fem_m->materials,fem_m->parameters,MeltingRateEnum,results->Size()+1,0,1); results->AddObject(result);
    104105
    105106                /*free ressource*/
    … …  
    109110        else{
    110111                for(i=0;i<nsteps;i++){
    111                         results->AddObject(new Result(results->Size()+1,time[i],i+1,"t_g",t_g[i]));
    112                         results->AddObject(new Result(results->Size()+1,time[i],i+1,"m_g",m_g[i]));
     112                        /*To be moved inside the loop!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
     113                        InputToResultx(&result,fem_t->elements,fem_t->nodes,fem_t->vertices, fem_t->loads, fem_t->materials,fem_t->parameters,TemperatureEnum,results->Size()+1,time[i],i+1); results->AddObject(result);
     114                        InputToResultx(&result,fem_m->elements,fem_m->nodes,fem_m->vertices, fem_m->loads, fem_m->materials,fem_m->parameters,MeltingRateEnum,results->Size()+1,time[i],i+1); results->AddObject(result);
    113115
    114116                        /*free ressource*/
    … …  
    128130        return results;
    129131
    130 
    131132}

  • issm/trunk/src/c/solutions/thermal_core_nonlinear.cpp

    r3922 r3941  
    110110                PenaltyConstraintsx(&constraints_converged, &num_unstable_constraints, fem->elements,fem->nodes,fem->vertices,fem->loads,fem->materials,fem->parameters,analysis_type,sub_analysis_type);
    111111               
     112                //Update inputs using new solution:
    112113                UpdateInputsFromVectorx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,tg,TemperatureEnum,VertexEnum);
    113 
     114                UpdateInputsFromSolutionx( fem->elements,fem->nodes, fem->vertices, fem->loads, fem->materials, fem->parameters,ug,analysis_type, sub_analysis_type);
    114115
    115116                if (!converged){

  • issm/trunk/src/c/solutions/transient_core_2d.cpp

    r3938 r3941  
    2424        /*output: */
    2525        Results* results=NULL;
     26        Result * result =NULL;
    2627
    2728        /*solutions: */
Note: See TracChangeset for help on using the changeset viewer.