Rev | Line | |
---|
[20498] | 1 | Index: ../trunk-jpl/src/c/cores/sealevelrise_core.cpp
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/src/c/cores/sealevelrise_core.cpp (revision 20034)
|
---|
| 4 | +++ ../trunk-jpl/src/c/cores/sealevelrise_core.cpp (revision 20035)
|
---|
| 5 | @@ -15,12 +15,16 @@
|
---|
| 6 | Vector<IssmDouble> *Sg_eustatic = NULL;
|
---|
| 7 | bool save_results;
|
---|
| 8 | int configuration_type;
|
---|
| 9 | + int numoutputs = 0;
|
---|
| 10 | + char **requested_outputs = NULL;
|
---|
| 11 |
|
---|
| 12 | if(VerboseSolution()) _printf0_(" computing sea level rise\n");
|
---|
| 13 |
|
---|
| 14 | /*Recover some parameters: */
|
---|
| 15 | femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
|
---|
| 16 | femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
|
---|
| 17 | + femmodel->parameters->FindParam(&numoutputs,SealevelriseNumRequestedOutputsEnum);
|
---|
| 18 | + if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SealevelriseRequestedOutputsEnum);
|
---|
| 19 |
|
---|
| 20 | /*set configuration: */
|
---|
| 21 | femmodel->SetCurrentConfiguration(SealevelriseAnalysisEnum);
|
---|
| 22 | @@ -35,9 +39,13 @@
|
---|
| 23 |
|
---|
| 24 | if(save_results){
|
---|
| 25 | if(VerboseSolution()) _printf0_(" saving results\n");
|
---|
| 26 | - int outputs[1] = {SealevelriseSEnum};
|
---|
| 27 | - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);
|
---|
| 28 | + femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
|
---|
| 29 | }
|
---|
| 30 | +
|
---|
| 31 | + /*Free ressources:*/
|
---|
| 32 | + if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
|
---|
| 33 | delete Sg;
|
---|
| 34 | delete Sg_eustatic;
|
---|
| 35 | +
|
---|
| 36 | +
|
---|
| 37 | }
|
---|
Note:
See
TracBrowser
for help on using the repository browser.