Changeset 15933

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:

• configs/config-arm-linux.sh (modified) (1 diff)
• src/mobile/native/Main.cpp (modified) (4 diffs)

issm/trunk-jpl/configs/config-arm-linux.sh ¶

@@ -3 +3 @@
 ./configure \
    --prefix=$ISSM_DIR\
-   --libdir=$ISSM_DIR/src/mobile/android/ISSM_APP/libs/armeabi\
+   --libdir=$ISSM_DIR/../mobile/android/ISSM_APP/libs/armeabi\
    --build="i386-apple-darwin10.8.0"\
    --host="arm-linux-androideabi"\

issm/trunk-jpl/src/mobile/native/Main.cpp ¶

@@ -1 @@
-#include "../../c/issm.h"
+#include "../../c/main/issm.h"
 #include <cstddef>
 #include <stdio.h>
@@ -22 +22 @@
                 int argc; //arguments to constructor.
                 char** argv = NULL;
-                COMM    communicator = 1; //fake communicator for constructor
                 const char* issmname = "issm.exe";
                 char *solution_type = NULL;
                 char *absfile = NULL;
                 char *relfile = NULL;
+                ISSM_MPI_Comm    comm=0;
 
                 /*log:*/
@@ -45 +45 @@
                 
                 /*call Model constructor passing in infile as File Descriptor parameter.*/
-                fm  = new FemModel(argc,argv,communicator);
+                fm  = new FemModel(argc,argv,comm);
 
                 /*we'll need the toolkits activated right away to use matrices: */
@@ -100 +100 @@
                 /*retrieve results: */
                 __android_log_print(ANDROID_LOG_INFO, "Native","Retrieving results ");
-                fm->elements->ProcessResultsUnits();
+                //fm->elements->ProcessResultsUnits(); we are now in SI units
                 patch=fm->elements->ResultsToPatch();