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

      • TabularUnified  

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

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

    r12878 r13101  
    1111#include "../Responsex/Responsex.h"
    1212
    13 void CostFunctionx(double* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
     13void CostFunctionx(IssmDouble* pJ, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,Parameters* parameters){
    1414
    1515        /*Intermediary*/
    1616        int      i;
    1717        int      num_responses;
    18         double   S;
    1918        Element *element       = NULL;
    2019        int     *responses     = NULL;
    2120
    2221        /*output: */
    23         double J,Jplus;
     22        IssmDouble J,Jplus;
    2423       
    2524        /*Recover parameters*/
Note: See TracChangeset for help on using the changeset viewer.