source: issm/oecreview/Archive/14312-15392/ISSM-14934-14935.diff

Last change on this file was 15393, checked in by Mathieu Morlighem, 12 years ago

NEW: adding Archive/14312-15392 for oecreview

File size: 2.4 KB
  • ../trunk-jpl/src/c/solutions/hydrology_core.cpp

     
    2020        int        output_frequency,hydrology_model;
    2121        bool       save_results;
    2222        bool       modify_loads=true;
     23        bool       isefficientlayer;
    2324        IssmDouble starttime,final_time;
    2425        IssmDouble time,dt;
    2526
     
    7879                }
    7980
    8081                else if (hydrology_model==HydrologydcEnum){
     82                        femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);
    8183                        if(VerboseSolution()) _pprintLine_("   computing water head");
    8284                        solver_hydro_nonlinear(femmodel);
    8385                        if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps)){
    8486                                if(VerboseSolution()) _pprintLine_("   saving results ");
    8587                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum);
    8688                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadResidualEnum);
    87 
     89                                if(isefficientlayer){
     90                                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EplHeadEnum);
     91                                }
    8892                                /*unload results*/
    8993                                if(VerboseSolution()) _pprintLine_("   saving temporary results");
    9094                                OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);
  • ../trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCEfficient/UpdateElementsHydrologyDCEfficient.cpp

     
    4949        iomodel->FetchDataToInput(elements,MeshElementonsurfaceEnum);
    5050        iomodel->FetchDataToInput(elements,MaskElementonwaterEnum);
    5151        iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum);
    52         iomodel->FetchDataToInput(elements,SedimentHeadEnum);
     52        iomodel->FetchDataToInput(elements,EplHeadEnum);
    5353
    5454        /*Free data: */
    5555        iomodel->DeleteData(1,MeshElementsEnum);
Note: See TracBrowser for help on using the repository browser.