Changeset 14058

Timestamp:

11/29/12 21:29:11 (12 years ago)

Author:

Eric.Larour

Message:

NEW: created new constructor

Location:

issm/trunk-jpl/src

Files:

• android/ISSM/gen/com/example/issm/R.java (modified) (1 diff)
• android/ISSM/jni/Main.cpp (modified) (1 diff)
• android/ISSM/jni/issmlib/libISSMCore.a (added)
• android/ISSM_Visual/bin/resources.ap_ (modified) ( previous)
• c/android/fac.cpp (modified) (1 diff)
• c/classes/FemModel.cpp (modified) (1 diff)
• c/classes/FemModel.h (modified) (1 diff)

issm/trunk-jpl/src/android/ISSM/gen/com/example/issm/R.java

@@ -22 +22 @@
     public static final class id {
         public static final int button1=0x7f080001;
+        public static final int button2=0x7f080003;
         public static final int input=0x7f080000;
-        public static final int menu_settings=0x7f080003;
+        public static final int menu_settings=0x7f080004;
         public static final int output=0x7f080002;
     }
     public static final class layout {
         public static final int activity_issm=0x7f030000;
+        public static final int activity_mapselection=0x7f030001;
     }
     public static final class menu {

issm/trunk-jpl/src/android/ISSM/jni/Main.cpp

@@ -8 +8 @@
 {
         fac* f;
-        //FemModel *fm;
+        FemModel *fm;
 //------------------------------------------------------------------------------------
         jint initilize(JNIEnv *env, jclass clazz, jstring file)
         {
-                const char *nativefile = env->GetStringUTFChars(file,0);
+                char *nativefile = (char*)env->GetStringUTFChars(file,0);
 
                 f = new fac();
 
                 //call Model constructor passing in infile as File Descriptor parameter.
-                // fm  = new FemModel(nativefile);
+                fm  = new FemModel(nativefile);
 
                 env->ReleaseStringUTFChars(file, nativefile); //must realease the char*

issm/trunk-jpl/src/c/android/fac.cpp

@@ -13 +13 @@
 
 /*}}}*/
-
+#include "stdio.h"
 long fac::factorial(long n) {
         long f = 1;
         long i;
+        printf("ok1\n");
         
         for(i = 1; i <= n; i++){
                 f *= i;
         }
+        printf("ok2\n");
         
         return f;

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -20 +20 @@
 
 /*Object constructors and destructor*/
+/*FUNCTION FemModel::FemModel(char* filename) {{{*/
+FemModel::FemModel(char* filename){
+
+}
+/*}}}*/
 /*FUNCTION FemModel::FemModel(int argc,char** argv){{{*/
 FemModel::FemModel(int argc,char** argv,COMM incomm){

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -47 +47 @@
 
                 /*constructors, destructors: */
+                FemModel(char* filename);
                 FemModel(int argc,char** argv,COMM comm_init);
                 FemModel(char* rootpath, char* inputfilename, char* outputfilename, char* petscfilename, char* lockfilename, const int solution_type,const int* analyses,const int nummodels);