Changeset 113

Timestamp:

06/11/14 14:45:15 (10 years ago)

Author:

jbrlod

Message:

small corrections

Location:

altifloat

Files:

• scripts/floater_d_test.i (modified) (3 diffs)
• src/floater.h (modified) (1 diff)
• src/floater_delta (modified) (previous)
• src/floater_delta.d (modified) (1 diff)

altifloat/scripts/floater_d_test.i

@@ -17 +17 @@
 #loadobs r_cout_d 0 i 0 A 1 ../obs_float/obs.dat D
 read_obs ../obs_float/obs_float_test.dat
-multirun
-lobs
+
 set_modeltime 0
 print_cost ON
@@ -32 +31 @@
 setm_ddf1 1.0
 
-run_inc
-#savestate uc_d 0 ij 0 A 3 ../obs_float/uc_d.dat
-#savestate u_d 0 ij 0 A 3 ../obs_float/u_d.dat
-
+multirun
+lobs
 goto fin
-
-#uniquement activer les trajectoires de type M model
-activ M only 
-
-forward
-
-savestate r_float 0 i 0 A 3 ../obs_float/r_float_forward.dat
-
-activ D only
-
-#testdf 1 29 21 4 r 0.0001 0.0001
-
-
-
-
+set_modeltime 0
 print_cost ON
 
@@ -64 +47 @@
 setm_ddf1 1.0
 
+run_inc
+#savestate uc_d 0 ij 0 A 3 ../obs_float/uc_d.dat
+#savestate u_d 0 ij 0 A 3 ../obs_float/u_d.dat
+
+goto fin
+
+#uniquement activer les trajectoires de type M model
+activ M only 
+
+forward
+
+savestate r_float 0 i 0 A 3 ../obs_float/r_float_forward.dat
+
+activ D only
+
+#testdf 1 29 21 4 r 0.0001 0.0001
+
+
+
+
+print_cost ON
+
+setm_impres 3
+setm_io 6
+setm_mode 0
+#set_nbiter 100
+set_nbiter 20
+setm_nsim 200
+setm_dxmin 1.0e-12
+setm_epsg 1.0e-12
+setm_ddf1 1.0
+
 RUNM
 savestate r_cout_d 0 i 0 A 3 ../obs_float/r_cout_d_optim_1.dat

altifloat/src/floater.h

@@ -1 @@
-
+#define UPDATE_BCK
 
 //constantes

altifloat/src/floater_delta.d

@@ -6 +6 @@
 //defval jtlag 720
 
-defval jptfl 4 //Nombre total de pas de temps
-defval jpnfl 1 //nombre total de flotteurs
+defval jptfl 7 //Nombre total de pas de temps
+defval jpnfl 2 //nombre total de flotteurs