Changeset 5475

Timestamp:

08/23/10 00:26:56 (15 years ago)

Author:

Eric.Larour

Message:

Now, instead of looking at descriptor, we look for the index in the parameters.
makes MassFluxx look like other types of responses, without special treatment for
special arguments.

Location:

issm/trunk/src/c/modules/MassFluxx

Files:

• MassFluxx.cpp (modified) (3 diffs)
• MassFluxx.h (modified) (1 diff)

issm/trunk/src/c/modules/MassFluxx/MassFluxx.cpp

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* descriptor,bool process_units){
+void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool process_units){
 
         int i,j;
@@ -38 +38 @@
         parameters->FindParam(&array,&M,&mdims_array,&ndims_array,QmuMassFluxSegmentsEnum);
 
-        /*figure out counter in the descriptor: */
-        sscanf(descriptor,"MassFlux%i",&counter);
+        /*Retrieve index of segments being used for MassFlux computation: */
+        if(!parameters->FindParam(&counter,IndexEnum))ISSMERROR(" could not find IndexEnum");
 
         /*retrieve segments from array: */
@@ -72 +72 @@
         xfree((void**)&ndims_array);
         xfree((void**)&array);
-
+        
         /*Assign output pointers: */
         *pmass_flux=mass_flux;

issm/trunk/src/c/modules/MassFluxx/MassFluxx.h

@@ -10 +10 @@
 
 /* local prototypes: */
-void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,const char* descriptor,bool process_units);
+void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool process_units);