Changeset 100

Timestamp:

06/06/13 17:11:40 (11 years ago)

Author:

jbrlod

Message:

bug on run_inc + creation of Makefile

Location:

altifloat

Files:

• obs_float/uoptim2.dat (modified) (3 diffs)
• obs_float/voptim2.dat (modified) (3 diffs)
• src/floater.h (modified) (3 diffs)
• src/floater_delta (modified) (previous)
• src/floater_delta.d (modified) (6 diffs)

altifloat/obs_float/uoptim2.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   7.091428041458130e-01
-1 10 18   1.794762909412384e-01
+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   5.038864910602570e-01
-1 11 18   2.065449431538582e-01
+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   8.216347545385361e-02
-1 12 18   6.344081461429596e-02
+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/voptim2.dat

@@ -537 +537 @@
 1 10 15   0.000000000000000e+00
 1 10 16   0.000000000000000e+00
-1 10 17   1.433710977435112e-01
-1 10 18   3.604327514767647e-02
+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   1.013527419418097e-01
-1 11 18   4.728766670450568e-02
+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   2.581698819994926e-02
-1 12 18   2.022251114249229e-02
+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/src/floater.h

@@ -53 +53 @@
                 YS1_u(j,k)+=YS1_u_d(j,k);
                 YS1_v(j,k)+=YS1_v_d(j,k);
+}
+}
+
+void erase_udvd() {
+  int j,k;
+  for (j=0;j<nlon;j++)
+        for (k=0;k<nlat;k++) {
+                YS1_u_d(j,k)=0;
+                YS1_v_d(j,k)=0;
 }
 }
@@ -114 +123 @@
          Yset_modeltime(0);
          before_it(1);
-         printf("---forward(i=%d)---\n",i);
+         //printf("---forward(i=%d)---\n",i);
          Yforward(-1, 0);
          
@@ -130 +139 @@
         Y3run ('0');
     update_uv();
+    erase_udvd();
 
     if (inc_save==1) {

altifloat/src/floater_delta.d

@@ +1 @@
+//#define FILTER
+
 defval jtlag 12//nombre de pas de temps Delta t/ delta t
 defval nlon 87 //nbre de points de grilles en longitude
 defval nlat 58 //nbre de points de grilles en latitude
 defval nfloat 1 //nbre de flotteurs
+
+#ifdef FILTER
+defval K_FILTER //create a define K_FILTER in the source code
+defval OFIL 6 //order of the filter
+#else
+defval OFIL 0 //Offtime of the main trajectory (0 since there is no filter)
+#endif
+
 
 hat_name "floater.h"
@@ -11 +21 @@
 option o_gradtest
 //option  O_EXTOBJ "../object/ncutil.o" //for aviso files
+#ifdef FILTER
+traj Tcstfil D 0    1 //Traj for control parameters
+traj Tfil    D 1    0     1    OFIL  //Traj for compute the filter
+#endif
 
 //    name   M upt offt  dt    nbstep
-traj T_float M 1    0     1    jtlag //trajectoire pour r 
+traj T_float M 1    OFIL  1    jtlag //trajectoire pour r 
 traj T_euler M 0    0     1    1 //trajectoire pour u et v
 
@@ -19 +33 @@
 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 
+
+#ifdef FILTER
+space S_euler_df   M nlon nlat Tcstfil //space for control parameter
+space S_euler_df_t M nlon nlat Tfil //space for filter calculation
+#endif
 
 space S_float M nfloat    T_float
@@ -45 +64 @@
 //modul xinter_d space S_float_d noward   output 8 tempo
 
+
+
+#ifdef FILTER
+//active filter
+modul uc_d     space S_euler_df noward output 1 target
+modul vc_d     space S_euler_df noward output 1 target
+modul lapfilu  space S_euler_df_t input 6 output 1 tempo
+modul lapfilv space  S_euler_df_t clonol lapfilu
+modul u_d      space S_euler_d  input 1 output 1
+modul v_d      space S_euler_d  input 1 output 1
+
+#else
+//no filter
 modul u_d       space S_euler_d noward   output 1 target //noward veut dire pas de calcul
 modul v_d                 space S_euler_d noward   output 1 target
+#endif
+
 modul locate_d  space S_eulerlocate_d input 2  output 1 tempo
 modul r_cout_d space S_float_d input 2  output 2 tempo cout
+
+//Filter modules
 
 
@@ -75 +111 @@
 ctin r_cout_d   1..2   from r_float_d 1..2 i t       
 
+#ifdef FILTER
+ctin lapfilu    1      from  uc_d     1  i   j
+ctin lapfilu    2      from  lapfilu  1  i   j   t-1
+ctin lapfilu    3      from  lapfilu  1  i-1 j   t-1
+ctin lapfilu    4      from  lapfilu  1  i+1 j   t-1
+ctin lapfilu    5      from  lapfilu  1  i   j-1 t-1
+ctin lapfilu    6      from  lapfilu  1  i   j+1 t-1
+
+ctin lapfilv    1      from  vc_d     1  i   j
+ctin lapfilv    2      from  lapfilv  1  i   j   t-1
+ctin lapfilv    3      from  lapfilv  1  i-1 j   t-1
+ctin lapfilv    4      from  lapfilv  1  i+1 j   t-1
+ctin lapfilv    5      from  lapfilv  1  i   j-1 t-1
+ctin lapfilv    6      from  lapfilv  1  i   j+1 t-1
+
+ctin uc_d       1      from  lapfilu   1  i   j   t
+ctin vc_d       1      from  lapfilv   1  i   j   t
+#endif
+
+
 exec disp_ct_in //afficher les connexions
+
+#ifdef FILTER
+order modinspace S_euler_df_t
+        order YA1 YA2
+               lapfilu lapfilv
+        forder
+forder
+#endif
 
 order modinspace S_float
@@ -106 +170 @@
 forder
 
+#ifdef FILTER
+order spaceintraj Tfil
+        S_euler_df
+forder
+#endif
+
 order spaceintraj T_float_d
         S_eulerlocate_d S_float_d