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/MaxVxx/MaxVxx.cpp

    r12168 r13101  
    99#include "../../EnumDefinitions/EnumDefinitions.h"
    1010
    11 void MaxVxx( double* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){
     11void MaxVxx( IssmDouble* pmaxvx, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters,bool process_units){
    1212       
    1313        int i;
    14         double maxvx;
    15         double node_maxvx;
    16         double element_maxvx;
     14        IssmDouble maxvx;
     15        IssmDouble node_maxvx;
     16        IssmDouble element_maxvx;
    1717
    1818        /*Go through elements, and request velocity: */
Note: See TracChangeset for help on using the changeset viewer.