Changeset 20035

Timestamp:

01/30/16 21:53:44 (9 years ago)

Author:

Eric.Larour

Message:

CHG: better requested outputs.

File:

• issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/cores/sealevelrise_core.cpp

@@ -16 +16 @@
         bool save_results;
         int configuration_type;
+        int        numoutputs        = 0;
+        char     **requested_outputs = NULL;
 
         if(VerboseSolution()) _printf0_("   computing sea level rise\n");
@@ -22 +24 @@
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
+        femmodel->parameters->FindParam(&numoutputs,SealevelriseNumRequestedOutputsEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SealevelriseRequestedOutputsEnum);
 
         /*set configuration: */
@@ -36 +40 @@
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");
-                int outputs[1] = {SealevelriseSEnum};
-                femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);
+                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
         }
+        
+        /*Free ressources:*/    
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
         delete Sg;
         delete Sg_eustatic;
+
+
 }