source: issm/oecreview/Archive/19101-20495/ISSM-20034-20035.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495

File size: 1.4 KB
  • ../trunk-jpl/src/c/cores/sealevelrise_core.cpp

     
    1515        Vector<IssmDouble> *Sg_eustatic    = NULL;
    1616        bool save_results;
    1717        int configuration_type;
     18        int        numoutputs        = 0;
     19        char     **requested_outputs = NULL;
    1820
    1921        if(VerboseSolution()) _printf0_("   computing sea level rise\n");
    2022
    2123        /*Recover some parameters: */
    2224        femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
    2325        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
     26        femmodel->parameters->FindParam(&numoutputs,SealevelriseNumRequestedOutputsEnum);
     27        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SealevelriseRequestedOutputsEnum);
    2428
    2529        /*set configuration: */
    2630        femmodel->SetCurrentConfiguration(SealevelriseAnalysisEnum);
     
    3539
    3640        if(save_results){
    3741                if(VerboseSolution()) _printf0_("   saving results\n");
    38                 int outputs[1] = {SealevelriseSEnum};
    39                 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);
     42                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
    4043        }
     44       
     45        /*Free ressources:*/   
     46        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
    4147        delete Sg;
    4248        delete Sg_eustatic;
     49
     50
    4351}
Note: See TracBrowser for help on using the repository browser.