Ignore:
Timestamp:
08/20/12 17:39:30 (13 years ago)
Author:
cborstad
Message:

merged trunk-jpl through revision 13099 into branch

Location:
issm/branches/trunk-jpl-damage
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • issm/branches/trunk-jpl-damage

    • Property svn:ignore

      •  

        old new  
         1projects
        12autom4te.cache
        23aclocal.m4
    • Property svn:mergeinfo changed
      /issm/trunk-jplmerged: 12948-13099

  • issm/branches/trunk-jpl-damage/src/c/modules/MassFluxx/MassFluxx.cpp

    r12878 r13101  
    1010#include "../../EnumDefinitions/EnumDefinitions.h"
    1111
    12 void MassFluxx(double* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool process_units){
     12void MassFluxx(IssmDouble* pmass_flux, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters,bool process_units){
    1313
    1414        int i,j;
    … …  
    2020       
    2121        /*output: */
    22         double mass_flux=0;
    23         double all_mass_flux=0;
     22        IssmDouble mass_flux=0;
     23        IssmDouble all_mass_flux=0;
    2424
    2525        int  counter;
    2626
    2727        /*all segments: */
    28         double** array=NULL;
     28        IssmDouble** array=NULL;
    2929        int      M;
    3030        int*     mdims_array=NULL;
    … …  
    3232
    3333        /*our segments of interest: */
    34         double*  segments=NULL;
     34        IssmDouble*  segments=NULL;
    3535        int      num_segments;
    3636
    … …  
    4848         * When we find one, use the element to compute the mass flux on the segment: */
    4949        for(i=0;i<num_segments;i++){
    50                 element_id=(int)*(segments+5*i+4);
     50                element_id=reCast<int,IssmDouble>(*(segments+5*i+4));
    5151                for(j=0;j<elements->Size();j++){
    5252                        element=(Element*)elements->GetObjectByOffset(j);
    … …  
    6666        /*Free ressources:*/
    6767        for(j=0;j<M;j++){
    68                 double* matrix=array[j];
    69                 xDelete<double>(matrix);
     68                IssmDouble* matrix=array[j];
     69                xDelete<IssmDouble>(matrix);
    7070        }
    7171        xDelete<int>(mdims_array);
    7272        xDelete<int>(ndims_array);
    73         xDelete<double*>(array);
     73        xDelete<IssmDouble*>(array);
    7474       
    7575        /*Assign output pointers: */
Note: See TracChangeset for help on using the changeset viewer.