Changeset 15933


Ignore:
Timestamp:
08/25/13 16:25:59 (12 years ago)
Author:
Eric.Larour
Message:

CHG: recompile native side of arm cross compile targets, using a new config-arm-linux.sh config
file and a new location $ISSM_DIR/../mobile/android location.

Location:
issm/trunk-jpl
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/configs/config-arm-linux.sh

    r14485 r15933  
    33./configure \
    44   --prefix=$ISSM_DIR\
    5    --libdir=$ISSM_DIR/src/mobile/android/ISSM_APP/libs/armeabi\
     5   --libdir=$ISSM_DIR/../mobile/android/ISSM_APP/libs/armeabi\
    66   --build="i386-apple-darwin10.8.0"\
    77   --host="arm-linux-androideabi"\
  • issm/trunk-jpl/src/mobile/native/Main.cpp

    r14712 r15933  
    1 #include "../../c/issm.h"
     1#include "../../c/main/issm.h"
    22#include <cstddef>
    33#include <stdio.h>
     
    2222                int argc; //arguments to constructor.
    2323                char** argv = NULL;
    24                 COMM    communicator = 1; //fake communicator for constructor
    2524                const char* issmname = "issm.exe";
    2625                char *solution_type = NULL;
    2726                char *absfile = NULL;
    2827                char *relfile = NULL;
     28                ISSM_MPI_Comm    comm=0;
    2929
    3030                /*log:*/
     
    4545               
    4646                /*call Model constructor passing in infile as File Descriptor parameter.*/
    47                 fm  = new FemModel(argc,argv,communicator);
     47                fm  = new FemModel(argc,argv,comm);
    4848
    4949                /*we'll need the toolkits activated right away to use matrices: */
     
    100100                /*retrieve results: */
    101101                __android_log_print(ANDROID_LOG_INFO, "Native","Retrieving results ");
    102                 fm->elements->ProcessResultsUnits();
     102                //fm->elements->ProcessResultsUnits(); we are now in SI units
    103103                patch=fm->elements->ResultsToPatch();
    104104
Note: See TracChangeset for help on using the changeset viewer.