Changeset 14515

Timestamp:

04/04/13 22:01:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: bug change from Lan plus minor changes

Location:

issm/trunk-jpl/src/mobile

Files:

• android/ISSM_APP/res/layout/settingsmenu.xml (modified) (1 diff)
• android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java (modified) (1 diff)
• native/Main.cpp (modified) (3 diffs)

issm/trunk-jpl/src/mobile/android/ISSM_APP/res/layout/settingsmenu.xml

@@ -67 +67 @@
              android:layout_height="wrap_content"
              android:layout_below="@+id/sealvlBar"
-             android:text="Parameters" /> 
+             android:text="Done" /> 
     </RelativeLayout>

issm/trunk-jpl/src/mobile/android/ISSM_APP/src/gov/nasa/jpl/issm/ISSM.java

@@ -251 +251 @@
                         super.onPostExecute(null);
                         dialog.setCancelable(true);
-                        dialog.setMessage("Loading View. Please Wait ...");
+                        dialog.setMessage("Running ISSM simulation. Please Wait ...");
                         dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
                         dialog.setProgress(0);

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

@@ -67 +67 @@
         }
         /*}}}*/
-        void Solve(JNIEnv *env, jclass clazz , jdouble alpha, jobject buf){ /*{{{*/
+        void Solve(JNIEnv *env, jclass clazz , jdouble alpha, jdouble temperature, jobject buf){ /*{{{*/
 
                 int i,count;
@@ -84 +84 @@
                 /*reset basal friction to what it was before: */
                 __android_log_print(ANDROID_LOG_INFO, "Native","alpha %g ",alpha);
+                /*reset basal temperature to what it was before: */
+                __android_log_print(ANDROID_LOG_INFO, "Native","temperature %g ",temperature);
+
                 InputDuplicatex(fm->elements,fm->nodes,fm->vertices,fm->loads,fm->materials,fm->parameters,AndroidFrictionCoefficientEnum,FrictionCoefficientEnum);
 
@@ -161 +164 @@
         {
                         {"createISSMModel"   ,"(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)I"  , (void *) Initialize},
-                        {"solveISSMModel", "(DLjava/nio/DoubleBuffer;)V", (void *) Solve}
+                        {"solveISSMModel", "(DDLjava/nio/DoubleBuffer;)V", (void *) Solve}
         };
         /*}}}*/