Changeset 103

Timestamp:

06/07/13 15:41:06 (11 years ago)

Author:

jbrlod

Message:

bug filter corrected

Location:

altifloat

Files:

• obs_float/uoptim1.dat (modified) (2 diffs)
• obs_float/uoptim2.dat (modified) (3 diffs)
• obs_float/voptim1.dat (modified) (2 diffs)
• obs_float/voptim2.dat (modified) (3 diffs)
• scripts/floater_d_test.i (modified) (1 diff)
• src/floater.h (modified) (3 diffs)
• src/floater_delta (modified) (previous)
• src/floater_delta.d (modified) (4 diffs)
• src/lapfilu.h (modified) (1 diff)
• src/u_d.h (modified) (1 diff)

altifloat/obs_float/uoptim1.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   0.000000000000000e+00
-1 10 18   0.000000000000000e+00
+1 10 17   3.395363688468933e-01
+1 10 18   8.488409221172333e-02
 1 10 19   0.000000000000000e+00
 1 10 20   0.000000000000000e+00
@@ -595 +595 @@
 1 11 15   0.000000000000000e+00
 1 11 16   0.000000000000000e+00
-1 11 17   0.000000000000000e+00
-1 11 18   0.000000000000000e+00
+1 11 17   1.455155909061432e-01
+1 11 18   3.637889772653580e-02
 1 11 19   0.000000000000000e+00
 1 11 20   0.000000000000000e+00

altifloat/obs_float/uoptim2.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   0.000000000000000e+00
-1 10 18   0.000000000000000e+00
+1 10 17   3.881162367761135e-01
+1 10 18   1.005681008100510e-01
 1 10 19   0.000000000000000e+00
 1 10 20   0.000000000000000e+00
@@ -595 +595 @@
 1 11 15   0.000000000000000e+00
 1 11 16   0.000000000000000e+00
-1 11 17   0.000000000000000e+00
-1 11 18   0.000000000000000e+00
+1 11 17   4.893954098224640e-01
+1 11 18   2.525196895003319e-01
 1 11 19   0.000000000000000e+00
 1 11 20   0.000000000000000e+00
@@ -653 +653 @@
 1 12 15   0.000000000000000e+00
 1 12 16   0.000000000000000e+00
-1 12 17   0.000000000000000e+00
-1 12 18   0.000000000000000e+00
+1 12 17   1.327397972345352e-01
+1 12 18   1.024922579526901e-01
 1 12 19   0.000000000000000e+00
 1 12 20   0.000000000000000e+00

altifloat/obs_float/voptim1.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   0.000000000000000e+00
-1 10 18   0.000000000000000e+00
+1 10 17   7.136353105306625e-02
+1 10 18   1.784088276326656e-02
 1 10 19   0.000000000000000e+00
 1 10 20   0.000000000000000e+00
@@ -595 +595 @@
 1 11 15   0.000000000000000e+00
 1 11 16   0.000000000000000e+00
-1 11 17   0.000000000000000e+00
-1 11 18   0.000000000000000e+00
+1 11 17   3.058437071740627e-02
+1 11 18   7.646092679351568e-03
 1 11 19   0.000000000000000e+00
 1 11 20   0.000000000000000e+00

altifloat/obs_float/voptim2.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   0.000000000000000e+00
-1 10 18   0.000000000000000e+00
+1 10 17   7.240399427246302e-02
+1 10 18   1.842492126161233e-02
 1 10 19   0.000000000000000e+00
 1 10 20   0.000000000000000e+00
@@ -595 +595 @@
 1 11 15   0.000000000000000e+00
 1 11 16   0.000000000000000e+00
-1 11 17   0.000000000000000e+00
-1 11 18   0.000000000000000e+00
+1 11 17   9.550390206277370e-02
+1 11 18   5.933662271127105e-02
 1 11 19   0.000000000000000e+00
 1 11 20   0.000000000000000e+00
@@ -653 +653 @@
 1 12 15   0.000000000000000e+00
 1 12 16   0.000000000000000e+00
-1 12 17   0.000000000000000e+00
-1 12 18   0.000000000000000e+00
+1 12 17   4.170881211757660e-02
+1 12 18   3.267061710357666e-02
 1 12 19   0.000000000000000e+00
 1 12 20   0.000000000000000e+00

altifloat/scripts/floater_d_test.i

@@ -30 +30 @@
 
 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
 

altifloat/src/floater.h

@@ -9 +9 @@
 //FILTER COEFFICIENTS
 #ifdef K_FILTER 
-YREAL c1=0.5;
+YREAL c1;
 YREAL c2,c3,c4,c5;
 #endif
@@ -23 +23 @@
 void appli_start(int argc, char *argv[]){
 #ifdef K_FILTER
-c2=c3=c4=c5=0.125;
+  c1=0.5;
+  c2=c3=c4=c5=0.125;
 #endif
 }
@@ -151 +152 @@
         
         Y3run ('0');
+#ifdef K_FILTER
+        //compute values for u_d and v_d
+        strcpy(liste[1],"Tfil");
+        Yactraj(3,liste);
+        Yset_modeltime(0);
+        before_it(1);
+        Yforward(-1, 0);
+        strcpy(liste[1],"T_euler_d");
+        Yactraj(3,liste);
+        Yset_modeltime(0);
+        before_it(1);
+        Yforward(-1, 0);
+#endif
+
+
     update_uv();
     erase_udvd();

altifloat/src/floater_delta.d

@@ -1 @@
-#define FILTER
+//#define FILTER
 
 defval jtlag 12//nombre de pas de temps Delta t/ delta t
@@ -28 +28 @@
 //    name   M upt offt  dt    nbstep
 traj T_float M 1    OFIL  1    jtlag //trajectoire pour r 
-traj T_euler M 0    0     1    1 //trajectoire pour u et v
+traj T_euler M 0    OFIL  1    1 //trajectoire pour u et v
 
 //deltas
-traj T_float_d D 1    0     1    jtlag //trajectoires type modele ou tangent. permet de controler quel type activer dans le i
-traj T_euler_d  D 0    0     1    1 
+traj T_euler_d  D 0    OFIL     1    1 
+traj T_float_d D 1    OFIL     1    jtlag //trajectoires type modele ou tangent. permet de controler quel type activer dans le i
+
 
 #ifdef FILTER
@@ -139 +140 @@
         forder
 forder
+
+order modinspace S_euler_d
+        order YA1 YA2
+            u_d v_d
+        forder
+forder
 #endif
 
@@ -174 +181 @@
         S_euler_df_t
 forder
+
+order spaceintraj T_euler_d
+        S_euler_d
+forder
 #endif
 

altifloat/src/lapfilu.h

@@ -19 +19 @@
 backward (YREAL xu_d, YREAL fij, YREAL fim1j, YREAL fip1j, YREAL fijm1, YREAL fijp1)
 {
-
+  /*
+  if (Yi==9 && Yj==16)
+    {
+      printf("YG=%g\n",YG1_u_d(Yi,Yj));
+    }
+  */
 if (Yt==1) { //first step time
     YJ1I1=1;

altifloat/src/u_d.h

@@ -6 +6 @@
 backward(YREAL ud)
 {
+  /*if (Yi==9 && Yj==16)
+    {
+      printf("YG=%g\n",YG1_u_d(Yi,Yj));
+      }*/
+
   YJ1I1=1;
 }