Changeset 58

Timestamp:

07/20/11 16:34:00 (13 years ago)

Author:

berrada

Message:

filtre forward

Location:

branches/branche-mb

Files:

• scripts/sinobad.i (modified) (2 diffs)
• src/.TERM_xterm (modified) (1 diff)
• src/filtre.h (added)
• src/sinobad.d (modified) (8 diffs)
• src/sinobad.h (modified) (2 diffs)
• src/ta_c.h (modified) (2 diffs)

branches/branche-mb/scripts/sinobad.i

@@ -12 +12 @@
 ##INITIALISATION
 xistate_init 1 ../data_in/file_rest/GYRE_00000424_restart.nc
+load_eb ta_c   // pour tenir en compte ta_c sinon sera 0 cause filtre
 true_target_in_tab ta_c
 xinitnc ../data_out/exp_T.nc
@@ -46 +47 @@
 ##INITIALISATION DE L'ASSIMILATION'
 xistate_init 1 ../data_in/file_rest/GYRE_00000400_restart.nc
+load_eb ta_c  // charger l'ebauche '
 set_modeltime 0
 print_time OFF

branches/branche-mb/src/.TERM_xterm

@@ -11 +11 @@
  lun. juin 27 15:44:44 CEST 2011 ... ariane.locean-ipsl.upmc.fr 
  mer. juin 29 16:45:11 CEST 2011 ... ariane.locean-ipsl.upmc.fr 
+ mar. juil. 12 12:15:52 CEST 2011 ... antea 

branches/branche-mb/src/sinobad.d

@@ +1 @@
+#define FILTER
 //#define SOLSORYAO
 //#define OPTIMORDER
@@ -5 +6 @@
 //#Mohamed Berrada 26/02/2009
 //#modification (#define) Julien Brajard 06/2011
+//#modification (filtre) Mohamed Berrada 19/07/2011
 //#==============================================================================
 //#DEFVAL ---------------------------------------------DEFVAL
@@ -15 +17 @@
 defval TA      50 |__DATE__ | number of time steps
 defval TU       2 | start time step
+#ifdef FILTER
+defval OFT      20
+#endif
+#ifndef FILTER
+defval OFT      0
+#endif
 //#exec disp_valdef
+#ifdef FILTER
+defval K_FILTER
+#endif
 #ifdef SOLSORYAO
 defval K_SOLSORYAO
@@ -38 +49 @@
 
 //#TRAJECTOIRES (DIM) -----------------------------------TRAJ
-traj  Tcst       M   0   1
-traj  Tsbd       M   TU  0   1  TA
+#ifdef FILTER
+traj  Tfilh      M   1  0   1  10
+traj  Tfilz      M   1  10   1  OFT
+#endif
+traj  Tcst       M   0   OFT  1 1
+traj  Tsbd       M   TU  OFT  1  TA
 exec disp_traj
 
@@ -62 +77 @@
 modul    sshn_c                 space   S3d inter YA1 YA2       noward            output 1      |target
 
+//#modul         ta_c                   space   S3d     input array NPCA                  output 1      
+
+#ifndef FILTER
 modul    ta_c                   space   S3d                     noward            output 1      target
-
-//#modul         ta_c                   space   S3d     input array NPCA                  output 1      
+#endif
 
 modul    sa_c                   space   S3d                     noward            output 1      |target
 modul    ua_c                   space   S3d                     noward            output 1      |target
 modul    va_c                   space   S3d                     noward            output 1      |target
+
+#ifdef FILTER
+modul    nu                     space   S3d                     noward            output 1      target
+modul    filtre                 space   S0d                     input 0           output 1
+modul    ta_c                   space   S3d                     input 0           output 1
+#endif
 
 //#-------------
@@ -811 +834 @@
 #endif
 
+#ifdef FILTER
+// calcul du filtre
+order modinspace S0d
+       order YA1
+            filtre
+      forder
+forder
+order modinspace S3d
+       order YA3 YA2 YA1
+            ta_c
+      forder
+forder
+#endif   
+
 #ifndef OPTIMORDER
-
+  
 order modinspace S3dt
 //#---------->sbcgyre
@@ -1008 +1045 @@
 
 #ifndef SOLSORYAO
+#ifdef FILTER
+order spaceintraj Tcst
+        S0d S3d
+forder
+#endif
+
 order spaceintraj Tsbd
         S3dt
@@ -1021 +1064 @@
 insert_fct  arg xchangesavemode
 
+insert_fct  arg load_eb
+
 insert_fct arg xwriteout
 insert_fct arg xwritegrad

branches/branche-mb/src/sinobad.h

@@ -13 +13 @@
 #include"../include/meshmask.h"
 
+#define ta_eb( i, j, k )  (ta_eb[(i)*(NY*NZ)+(j)*(NZ)+(k)]) // ebauche
+double ta_eb[NZ*NY*NX];   // ebauche
+void load_eb (int argc, char *argv[]);  // load "ebauche" from current variable ta_c  
 // For PPCA 
 /*double shfs_ta[NZ*NY*NX][NPCA];
@@ -529 +532 @@
   }
 }
+//______________________________________________________________________________
+void load_eb (int argc, char *argv[]){  // load "ebauche"
+  // on doit presiser la variable exple : load_eb ta_c
+  if (!strcmp(argv[1],"ta_c")){
+    for(int i=0;i<NX;i++)
+      for(int j=0;j<NY;j++)
+        for(int k=0;k<NZ;k++){
+          ta_eb( i, j, k )=0.0;
+        }
+    for(int i=0;i<NX;i++)
+      for(int j=0;j<NY;j++)
+        for(int k=0;k<NZ;k++){
+          ta_eb( i, j, k )=YS_ta_c(0,i,j,k);
+        }
+    
+  }
+  else{
+    printf( "function load_eb:: argument incorrect\n");
+    exit(99);// abort program
+  }
+}
+
+
 //_____________________________________________________________________________
 /*void load_shape_func (int argc, char *argv[])  // load PCA axes from file

branches/branche-mb/src/ta_c.h

@@ -7 +7 @@
 //                          methode forward
 forward ()
-{ /*    1..NPCA from    pca_ta                  1..NPCA  1*/
-  double sum=moy_ta(Yi,Yj,Yk);
-  for(int n=0;n<NPCA;n++) sum+=Yting[n]*stdev_ta[n]*shfs_ta(Yi,Yj,Yk,n);
-  YS1=sum;
-  //
+{ 
+  YS1 = ta_eb(Yi,Yj,Yk) +dta_c(Yi,Yj,Yk);
+
+
+  ///*  1..NPCA from    pca_ta                  1..NPCA  1*/
+  //double sum=moy_ta(Yi,Yj,Yk);
+  //for(int n=0;n<NPCA;n++) sum+=Yting[n]*stdev_ta[n]*shfs_ta(Yi,Yj,Yk,n);
+  //YS1=sum;
+  ////
 }
 //===========================================================================
@@ -18 +22 @@
 backward ()
 {
-  for(int n=0;n<NPCA;n++)       
-    Yjac[0][n]    = stdev_ta[n]*shfs_ta(Yi,Yj,Yk,n);
-  //
+  //gradient se calcule dans le module filtre
+  
+  //for(int n=0;n<NPCA;n++)     
+  //  Yjac[0][n]    = stdev_ta[n]*shfs_ta(Yi,Yj,Yk,n);
+  ////
 }