Changeset 16794

Timestamp:

11/15/13 16:19:47 (11 years ago)

Author:

Eric.Larour

Message:

CHG: changed the way OutputDefinitionsResponsex retrieves the output definitions, so we can store information
in the output definitions without it being wiped out the next time we call the corresponding response function.

File:

• issm/trunk-jpl/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp ¶

@@ -15 +15 @@
 
         /*Ok, go find the output definitions dataset in the parameters, where our responses are hiding: */
-        femmodel->parameters->FindParam(&output_definitions,OutputdefinitionEnum); _assert_(output_definitions);
+        output_definitions=((DataSetParam*)femmodel->parameters->FindParamObject(OutputdefinitionEnum))->value;
 
         /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_string: */
@@ -24 +24 @@
                 char* name = definition->Name();
                 if (strcmp(name,output_string)==0){
+
                         /*This is the object that we have been chasing for. compute the response and return: */
                         return_value=definition->Response(femmodel);
-                        delete output_definitions;
+                
+                        /*cleanup: */
                         xDelete<char>(name);
+
+                        /*return:*/
                         return return_value;
                 }
                 xDelete<char>(name);
         }
+        
         /*If we are here, did not find the definition for this response, not good!: */
         _error_("Could not find the response for output definition " << output_string << " because could not find the definition itself!");