Changeset 9 for trunk

Timestamp:

03/14/11 19:31:32 (13 years ago)

Author:

jbrlod

Message:

begin ref run

Location:

trunk

Files:

• scripts/sinobad.i (modified) (2 diffs)
• src/Yworkdir/Y1sinobad.h (modified) (26 diffs)
• src/Yworkdir/Y2sinobad.h (modified) (268 diffs)
• src/Yworkdir/Ysinobad.cpp (modified) (1 diff)
• src/cost.dat (modified) (1 diff)
• src/sbcgyre_utau_vtau.h (modified) (1 diff)
• src/sinobad (modified) (previous)
• src/sinobad.d (modified) (5 diffs)
• src/sinobad.h (modified) (1 diff)
• src/ua_de_dynzdf_imp.h (modified) (1 diff)

trunk/scripts/sinobad.i

@@ -6 +6 @@
 #paramÚtres à régler : TA=50 (48 pdt effectifs)
 #NX=32,NY=22,NZ=31
-#
+#paramÚres de contrÎle : sshn_c, ta_c, sa_c, ua_c, va_c
+#obs (3D a t=48 Yt=50) : sshb, tb, sb,ub,vb
 
 ##INITIALISATION
+xistate_init 1 ../data_in/file_rest/GYRE_00000424_restart.nc
+true_target_in_tab ta_c
+
+
+savestate sshn_c  1   ij   0    A       1       ../data_out/sshn_c_true.dat
+savestate ta_c  1   ijk   0    A       1       ../data_out/ta_c_true.dat
+savestate sa_c  1   ijk   0    A       1       ../data_out/sa_c_true.dat
+savestate ua_c  1   ijk   0    A       1       ../data_out/ua_c_true.dat
+savestate va_c  1   ijk   0    A       1       ../data_out/va_c_true.dat
+
+print_time OFF
+set_modeltime 0
+FORWARD
+
 
 ##OBSERVATION
-
-##INITIALISATION DE L'ASSIMILATION
-
-##DEBUT DE L'ASSIMILATION
-
+savestate sshb  1   ij   50    A       1       ../data_out/sshb_obs_48.dat   
+savestate tb  1   ijk   50    A       1       ../data_out/tb_obs_48.dat   
+savestate sb  1   ijk   50    A       1       ../data_out/sb_obs_48.dat   
+savestate ub  1   ijk   50    A       1       ../data_out/ub_obs_48.dat   
+savestate vb  1   ijk   50    A       1       ../data_out/vb_obs_48.dat   
+
+loadobs sshb  1   ij   50    A       1       ../data_out/sshb_obs_48.dat D   
+loadobs tb  1   ijk   50    A       1       ../data_out/tb_obs_48.dat D   
+loadobs sb  1   ijk   50    A       1       ../data_out/sb_obs_48.dat D   
+loadobs ub  1   ijk   50    A       1       ../data_out/ub_obs_48.dat D   
+loadobs vb  1   ijk   50    A       1       ../data_out/vb_obs_48.dat D   
+
+
+#goto FINRUN
+
+##INITIALISATION DE L'ASSIMILATION'
+xistate_init 1 ../data_in/file_rest/GYRE_00000400_restart.nc
+set_modeltime 0
+print_time OFF
+FORWARD
+savestate sshn_c  1   ij   0    A       1       ../data_out/sshn_c_init.dat
+savestate ta_c  1   ijk   0    A       1       ../data_out/ta_c_init.dat
+savestate sa_c  1   ijk   0    A       1       ../data_out/sa_c_init.dat
+savestate ua_c  1   ijk   0    A       1       ../data_out/ua_c_init.dat
+savestate va_c  1   ijk   0    A       1       ../data_out/va_c_init.dat
+
+##DEBUT DE L'ASSIMILATION'
+
+set_modeltime 0
+!echo "RUN OPTIMIZATION WITH M1QN3 ......."
+setm_impres  5
+setm_io      6
+setm_mode    1
+set_nbiter   100
+setm_nsim    100
+setm_dxmin   1.0e-4
+setm_epsg    1.0e-10
+setm_ddf1    1
+runm
 ##SAUVEGARDE
+savestate sshn_c  1   ij   0    A       1       ../data_out/sshn_c_fin.dat
+savestate ta_c  1   ijk   0    A       1       ../data_out/ta_c_fin.dat
+savestate sa_c  1   ijk   0    A       1       ../data_out/sa_c_fin.dat
+savestate ua_c  1   ijk   0    A       1       ../data_out/ua_c_fin.dat
+savestate va_c  1   ijk   0    A       1       ../data_out/va_c_fin.dat
+
+goto FINRUN
 
 ## analytiquement (2) 
@@ -44 +100 @@
 
 #setstate pca_ta 0
-GOTO NOF
+GOTO NOF 
 ## Faire une simulation direct 
 print_time OFF

trunk/src/Yworkdir/Y1sinobad.h

@@ -17 +17 @@
 #define         YO_M1QN3
 #define         YO_GRADTEST
+#define         YO_DBG_NANF
 #define         YDOUBLE 
 #define         YTINY  1.e-15 
@@ -58 +59 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module sshn_c~~~~~~~~~~~~~~~~~~~~~~~~~
 #define Yid_sshn_c 0
+#define YNBPTARGET_sshn_c 0
+#define YDEBTARGET_sshn_c 0
+#define YENDTARGET_sshn_c 0
 /*M2_VALST  */ #define   Ydelta_sshn_c(v, i, j, t)               Ysshn_c[i][j]->Ydelta[t][v] 
 /*M2_VALST  */ #define   YD_sshn_c(v, i, j, t)           Ysshn_c[i][j]->Ydelta[t][v] 
@@ -76 +80 @@
 /*M2_VALSGI */ #define   YG1_sshn_c(i, j)                Ysshn_c[i][j]->Ygrad[0] 
 /*M2_HERESGI*/ #define   YG1Y_sshn_c             Ysshn_c[Yi][Yj]->Ygrad[0] 
+/*M2_VALSG  */ #define   Yepsi_sshn_c(v, i, j)           Ysshn_c[i][j]->Yepsi[v] 
+/*M2_VALSG  */ #define   YE_sshn_c(v, i, j)              Ysshn_c[i][j]->Yepsi[v] 
+/*M2_VALSGI */ #define   YE1_sshn_c(i, j)                Ysshn_c[i][j]->Yepsi[0] 
 Yaosshn_c                *Ysshn_c[YA1_S3d][YA2_S3d];
+/*M2_VALSG  */ #define   Ywish_sshn_c(v, i, j)           Ysshn_c[i][j]->Ywish[v] 
+/*M2_VALSG  */ #define   YW_sshn_c(v, i, j)              Ysshn_c[i][j]->Ywish[v] 
+/*M2_VALSGI */ #define   YW1_sshn_c(i, j)                Ysshn_c[i][j]->Ywish[0] 
+/*M2_HERESGI*/ #define   YW1Y_sshn_c             Ysshn_c[Yi][Yj]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module ta_c~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -111 +122 @@
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module sa_c~~~~~~~~~~~~~~~~~~~~~~~~~
 #define Yid_sa_c 2
+#define YNBPTARGET_sa_c 0
+#define YDEBTARGET_sa_c 0
+#define YENDTARGET_sa_c 0
 /*M3_VALST  */ #define   Ydelta_sa_c(v, i, j, k, t)      Ysa_c[i][j][k]->Ydelta[t][v] 
 /*M3_VALST  */ #define   YD_sa_c(v, i, j, k, t)                  Ysa_c[i][j][k]->Ydelta[t][v] 
@@ -128 +142 @@
 /*M3_VALSGI */ #define   YG1_sa_c(i, j, k)               Ysa_c[i][j][k]->Ygrad[0] 
 /*M3_HERESGI*/ #define   YG1Y_sa_c               Ysa_c[Yi][Yj][Yk]->Ygrad[0] 
+/*M3_VALSG  */ #define   Yepsi_sa_c(v, i, j, k)          Ysa_c[i][j][k]->Yepsi[v] 
+/*M3_VALSG  */ #define   YE_sa_c(v, i, j, k)             Ysa_c[i][j][k]->Yepsi[v] 
+/*M3_VALSGI */ #define   YE1_sa_c(i, j, k)               Ysa_c[i][j][k]->Yepsi[0] 
 Yaosa_c                  *Ysa_c[YA1_S3d][YA2_S3d][YA3_S3d];
+/*M3_VALSG  */ #define   Ywish_sa_c(v, i, j, k)          Ysa_c[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_sa_c(v, i, j, k)             Ysa_c[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_sa_c(i, j, k)               Ysa_c[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_sa_c               Ysa_c[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module ua_c~~~~~~~~~~~~~~~~~~~~~~~~~
 #define Yid_ua_c 3
+#define YNBPTARGET_ua_c 0
+#define YDEBTARGET_ua_c 0
+#define YENDTARGET_ua_c 0
 /*M3_VALST  */ #define   Ydelta_ua_c(v, i, j, k, t)      Yua_c[i][j][k]->Ydelta[t][v] 
 /*M3_VALST  */ #define   YD_ua_c(v, i, j, k, t)                  Yua_c[i][j][k]->Ydelta[t][v] 
@@ -149 +173 @@
 /*M3_VALSGI */ #define   YG1_ua_c(i, j, k)               Yua_c[i][j][k]->Ygrad[0] 
 /*M3_HERESGI*/ #define   YG1Y_ua_c               Yua_c[Yi][Yj][Yk]->Ygrad[0] 
+/*M3_VALSG  */ #define   Yepsi_ua_c(v, i, j, k)          Yua_c[i][j][k]->Yepsi[v] 
+/*M3_VALSG  */ #define   YE_ua_c(v, i, j, k)             Yua_c[i][j][k]->Yepsi[v] 
+/*M3_VALSGI */ #define   YE1_ua_c(i, j, k)               Yua_c[i][j][k]->Yepsi[0] 
 Yaoua_c                  *Yua_c[YA1_S3d][YA2_S3d][YA3_S3d];
+/*M3_VALSG  */ #define   Ywish_ua_c(v, i, j, k)          Yua_c[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_ua_c(v, i, j, k)             Yua_c[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_ua_c(i, j, k)               Yua_c[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_ua_c               Yua_c[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module va_c~~~~~~~~~~~~~~~~~~~~~~~~~
 #define Yid_va_c 4
+#define YNBPTARGET_va_c 0
+#define YDEBTARGET_va_c 0
+#define YENDTARGET_va_c 0
 /*M3_VALST  */ #define   Ydelta_va_c(v, i, j, k, t)      Yva_c[i][j][k]->Ydelta[t][v] 
 /*M3_VALST  */ #define   YD_va_c(v, i, j, k, t)                  Yva_c[i][j][k]->Ydelta[t][v] 
@@ -170 +204 @@
 /*M3_VALSGI */ #define   YG1_va_c(i, j, k)               Yva_c[i][j][k]->Ygrad[0] 
 /*M3_HERESGI*/ #define   YG1Y_va_c               Yva_c[Yi][Yj][Yk]->Ygrad[0] 
+/*M3_VALSG  */ #define   Yepsi_va_c(v, i, j, k)          Yva_c[i][j][k]->Yepsi[v] 
+/*M3_VALSG  */ #define   YE_va_c(v, i, j, k)             Yva_c[i][j][k]->Yepsi[v] 
+/*M3_VALSGI */ #define   YE1_va_c(i, j, k)               Yva_c[i][j][k]->Yepsi[0] 
 Yaova_c                  *Yva_c[YA1_S3d][YA2_S3d][YA3_S3d];
+/*M3_VALSG  */ #define   Ywish_va_c(v, i, j, k)          Yva_c[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_va_c(v, i, j, k)             Yva_c[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_va_c(i, j, k)               Yva_c[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_va_c               Yva_c[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module sbcgyre_qsr_qns~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1056 +1097 @@
 /*M3_HERESIT*/ #define   YG1Y_sb                 Ysb[Yi][Yj][Yk]->Ygrad[YTemps][0] 
 sb               *Ysb[YA1_S3dt][YA2_S3dt][YA3_S3dt];
+/*M3_VALSG  */ #define   Ywish_sb(v, i, j, k)    Ysb[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_sb(v, i, j, k)               Ysb[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_sb(i, j, k)                 Ysb[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_sb                 Ysb[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module rhd~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2088 +2133 @@
 /*M2_HERESIT*/ #define   YG1Y_sshb               Ysshb[Yi][Yj]->Ygrad[YTemps][0] 
 sshb             *Ysshb[YA1_S3dt][YA2_S3dt];
+/*M2_VALSG  */ #define   Ywish_sshb(v, i, j)             Ysshb[i][j]->Ywish[v] 
+/*M2_VALSG  */ #define   YW_sshb(v, i, j)                Ysshb[i][j]->Ywish[v] 
+/*M2_VALSGI */ #define   YW1_sshb(i, j)                  Ysshb[i][j]->Ywish[0] 
+/*M2_HERESGI*/ #define   YW1Y_sshb               Ysshb[Yi][Yj]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module ub~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2111 +2160 @@
 /*M3_HERESIT*/ #define   YG1Y_ub                 Yub[Yi][Yj][Yk]->Ygrad[YTemps][0] 
 ub               *Yub[YA1_S3dt][YA2_S3dt][YA3_S3dt];
+/*M3_VALSG  */ #define   Ywish_ub(v, i, j, k)    Yub[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_ub(v, i, j, k)               Yub[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_ub(i, j, k)                 Yub[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_ub                 Yub[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module vb~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2134 +2187 @@
 /*M3_HERESIT*/ #define   YG1Y_vb                 Yvb[Yi][Yj][Yk]->Ygrad[YTemps][0] 
 vb               *Yvb[YA1_S3dt][YA2_S3dt][YA3_S3dt];
+/*M3_VALSG  */ #define   Ywish_vb(v, i, j, k)    Yvb[i][j][k]->Ywish[v] 
+/*M3_VALSG  */ #define   YW_vb(v, i, j, k)               Yvb[i][j][k]->Ywish[v] 
+/*M3_VALSGI */ #define   YW1_vb(i, j, k)                 Yvb[i][j][k]->Ywish[0] 
+/*M3_HERESGI*/ #define   YW1Y_vb                 Yvb[Yi][Yj][Yk]->Ywish[0] 
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~ module hdivn~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2203 +2260 @@
 /*M3_HERESIT*/ #define   YG1Y_wa                 Ywa[Yi][Yj][Yk]->Ygrad[YTemps][0] 
 wa               *Ywa[YA1_S3dt][YA2_S3dt][YA3_S3dt];
-#define  YSIZEPB   21824//sum of the number of states (output) of all targets
+#define  YSIZEPB   88000//sum of the number of states (output) of all targets
 
 //€ € € € FOR M1QN3 € € € € € € € € € € € € € € € € € € € € € € €
 float   Y3x[YSIZEPB]; //table for the states of targets 
 float   Y3g[YSIZEPB]; //table for the gradients of targets
-#define Y3_SZ_RZ   436488  //rz dimension
+#define Y3_SZ_RZ   1760008  //rz dimension
 float   Y3rz[Y3_SZ_RZ];
 #define Y3_SZ_IZ   5  //iz dimension
@@ -2214 +2271 @@
 
 /*------- GENERATION of global objects ------------------------*/
-#define YSIZECO        21824 //size of modules cout (atempo)(event if not in order !)
+#define YSIZECO        88000 //size of modules cout (atempo)(event if not in order !)
 #define YMAX_NBI        31 //max input number of a module 
 #define YMAX_NBS        4 //max output number of a module
@@ -2372 +2429 @@
               double     Ystate[YNBS_sshn_c];
               double     Ygrad[YNBS_sshn_c];
+              double     Yepsi[YNBS_sshn_c];
+              double     Ywish[YNBS_sshn_c];
               double     Ydelta[1][YNBS_sshn_c];
 
@@ -2402 +2461 @@
               double     Ystate[YNBS_sa_c];
               double     Ygrad[YNBS_sa_c];
+              double     Yepsi[YNBS_sa_c];
+              double     Ywish[YNBS_sa_c];
               double     Ydelta[1][YNBS_sa_c];
 
@@ -2416 +2477 @@
               double     Ystate[YNBS_ua_c];
               double     Ygrad[YNBS_ua_c];
+              double     Yepsi[YNBS_ua_c];
+              double     Ywish[YNBS_ua_c];
               double     Ydelta[1][YNBS_ua_c];
 
@@ -2430 +2493 @@
               double     Ystate[YNBS_va_c];
               double     Ygrad[YNBS_va_c];
+              double     Yepsi[YNBS_va_c];
+              double     Ywish[YNBS_va_c];
               double     Ydelta[1][YNBS_va_c];
 
@@ -3067 +3132 @@
               double     Ystate[YNBALLTIME_Tsbd][YNBS_sb];
               double     Ygrad[YNBALLTIME_Tsbd][YNBS_sb];
+              double     Ywish[YNBS_sb];
               double     Ydelta[YNBALLTIME_Tsbd][YNBS_sb];
 
@@ -3893 +3959 @@
               double     Ystate[YNBALLTIME_Tsbd][YNBS_sshb];
               double     Ygrad[YNBALLTIME_Tsbd][YNBS_sshb];
+              double     Ywish[YNBS_sshb];
               double     Ydelta[YNBALLTIME_Tsbd][YNBS_sshb];
 
@@ -3916 +3983 @@
               double     Ystate[YNBALLTIME_Tsbd][YNBS_ub];
               double     Ygrad[YNBALLTIME_Tsbd][YNBS_ub];
+              double     Ywish[YNBS_ub];
               double     Ydelta[YNBALLTIME_Tsbd][YNBS_ub];
 
@@ -3939 +4007 @@
               double     Ystate[YNBALLTIME_Tsbd][YNBS_vb];
               double     Ygrad[YNBALLTIME_Tsbd][YNBS_vb];
+              double     Ywish[YNBS_vb];
               double     Ydelta[YNBALLTIME_Tsbd][YNBS_vb];
 
@@ -4028 +4097 @@
 void Yrazgrad_sshn_c(); 
 void Ysetstate_sshn_c(); 
-void Yrazgrad_ta_c(); 
+void Ysetepsi_sshn_c(); 
+void Yadjust_sshn_c(); 
+void Y3getstate_sshn_c(float x[]); 
+void Y3valstate_sshn_c(); 
+void Y3valgrad_sshn_c(float g[]); void Yrazgrad_ta_c(); 
 void Ysetstate_ta_c(); 
 void Ysetepsi_ta_c(); 
@@ -4036 +4109 @@
 void Y3valgrad_ta_c(float g[]); void Yrazgrad_sa_c(); 
 void Ysetstate_sa_c(); 
-void Yrazgrad_ua_c(); 
+void Ysetepsi_sa_c(); 
+void Yadjust_sa_c(); 
+void Y3getstate_sa_c(float x[]); 
+void Y3valstate_sa_c(); 
+void Y3valgrad_sa_c(float g[]); void Yrazgrad_ua_c(); 
 void Ysetstate_ua_c(); 
-void Yrazgrad_va_c(); 
+void Ysetepsi_ua_c(); 
+void Yadjust_ua_c(); 
+void Y3getstate_ua_c(float x[]); 
+void Y3valstate_ua_c(); 
+void Y3valgrad_ua_c(float g[]); void Yrazgrad_va_c(); 
 void Ysetstate_va_c(); 
-void Yrazgrad_sbcgyre_qsr_qns(); 
+void Ysetepsi_va_c(); 
+void Yadjust_va_c(); 
+void Y3getstate_va_c(float x[]); 
+void Y3valstate_va_c(); 
+void Y3valgrad_va_c(float g[]); void Yrazgrad_sbcgyre_qsr_qns(); 
 void Ysetstate_sbcgyre_qsr_qns(); 
 void Yrazgrad_sbcgyre_emp1(); 
@@ -4236 +4321 @@
 #define YNBMODUL       87 
 struct Yst_modul YTabMod[87] = {
-        {"sshn_c", *Ysshn_c, 2, 32, 22, 0, 0, 1, 0, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
+        {"sshn_c", *Ysshn_c, 2, 32, 22, 0, 0, 1, 0, 0, 1, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
         {"ta_c", *Yta_c, 3, 32, 22, 31, 0, 1, 0, 0, 1, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
-        {"sa_c", *Ysa_c, 3, 32, 22, 31, 0, 1, 0, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
-        {"ua_c", *Yua_c, 3, 32, 22, 31, 0, 1, 0, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
-        {"va_c", *Yva_c, 3, 32, 22, 31, 0, 1, 0, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
+        {"sa_c", *Ysa_c, 3, 32, 22, 31, 0, 1, 0, 0, 1, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
+        {"ua_c", *Yua_c, 3, 32, 22, 31, 0, 1, 0, 0, 1, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
+        {"va_c", *Yva_c, 3, 32, 22, 31, 0, 1, 0, 0, 1, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 0, "S3d"},
         {"sbcgyre_qsr_qns", *Ysbcgyre_qsr_qns, 2, 32, 22, 0, 1, 2, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"sbcgyre_emp1", *Ysbcgyre_emp1, 2, 32, 22, 0, 0, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
@@ -4275 +4360 @@
         {"sa", *Ysa, 3, 32, 22, 31, 5, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"tb", *Ytb, 3, 32, 22, 31, 4, 1, 52, 1, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
-        {"sb", *Ysb, 3, 32, 22, 31, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
+        {"sb", *Ysb, 3, 32, 22, 31, 4, 1, 52, 1, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"rhd", *Yrhd, 3, 32, 22, 31, 2, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"rhop", *Yrhop, 3, 32, 22, 31, 1, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
@@ -4317 +4402 @@
         {"va", *Yva, 3, 32, 22, 31, 3, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"sshn", *Ysshn, 2, 32, 22, 0, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
-        {"sshb", *Ysshb, 2, 32, 22, 0, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
-        {"ub", *Yub, 3, 32, 22, 31, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
-        {"vb", *Yvb, 3, 32, 22, 31, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
+        {"sshb", *Ysshb, 2, 32, 22, 0, 4, 1, 52, 1, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
+        {"ub", *Yub, 3, 32, 22, 31, 4, 1, 52, 1, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
+        {"vb", *Yvb, 3, 32, 22, 31, 4, 1, 52, 1, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"hdivn", *Yhdivn, 3, 32, 22, 31, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},
         {"rotn", *Yrotn, 3, 32, 22, 31, 4, 1, 52, 0, 0, 0, 0, 1.000000e+00, 1.000000e+00, 1.000000e+00, 1, "S3dt"},

trunk/src/Yworkdir/Y2sinobad.h

@@ -5 +5 @@
 
 // € € € € € € € € LES FONCTIONS PREDEFINIES
-/*M2_TBTOG   */ 
+/*M2_ADJUS*/ 
+void Yadjust_sshn_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1) 
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2) 
+         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws) 
+         { Ystate_sshn_c(Yws, Yw1, Yw2) -= Yepsi_sshn_c(Yws, Yw1, Yw2) * Ygrad_sshn_c(Yws, Yw1, Yw2);
+        }
+}/*M2_GCTOTB  */ 
+void YgradCTOtab_sshn_c(YREAL tab[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 tab[Y3windice] += YG_sshn_c(Yws, Yw1, Yw2); ++Y3windice;}}}
+}/*M2_VSTA*/ 
+void Y3valstate_sshn_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 Y3x[Y3windice] = Ysshn_c(Yw1, Yw2)->Ystate[Yws]; ++Y3windice;}}}
+}/*M2_GSTA*/ 
+void Y3getstate_sshn_c(float x[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 Ysshn_c(Yw1, Yw2)->Ystate[Yws] = x[Y3windice]; ++Y3windice;}}}
+}/*M2_VGRAD*/ 
+void Y3valgrad_sshn_c(float g[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 g[Y3windice] = Ysshn_c(Yw1, Yw2)->Ygrad[Yws]; ++Y3windice;}}}
+}/*M2_TBTOG   */ 
 void YtabTOgrad_sshn_c(YREAL tab[])
 {
@@ -105 +141 @@
 void Yio_sshn_c(int Yws, int Yw1, int Yw2, int Yw3, int Ywt, double val)        
 {  Yiorwf ("sshn_c", Yws, Yw1, Yw2, Yw3, Ywt, &YS_sshn_c(Yws, Yw1, Yw2), val);
+}/*M0_OUTOB*/ 
+int Youtoobs_sshn_c(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("sshn_c");
+         Yaobs.smod = Yws;/*M2_OUTOB*/ 
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2)
+         {      if(select_io(yiokind, "sshn_c", Yws, Yw1, Yw2, -1, Ywt, &Ystate_sshn_c(Yws, Yw1, Yw2)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = -1;
+                                Yaobs.vobs = Ystate_sshn_c(Yws, Yw1, Yw2);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
+}/*M2_SEPS*/ 
+void Ysetepsi_sshn_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 Ysshn_c(Yw1, Yw2)->Yepsi[Yws] = val;}}}
 }/*M2_CREY*/ 
 void Ycreate_sshn_c()  
@@ -111 +169 @@
                  for (int Yw2=0; Yw2<YA2_S3d; ++Yw2){
                          if ((Ysshn_c(Yw1, Yw2)= new Yaosshn_c ())==NULL) Ycreate_errnew();}}
+}/*M2_SWISH*/ 
+void Ysetwish_sshn_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshn_c; ++Yws){
+                                 Ywish_sshn_c(Yws, Yw1, Yw2) = val;}}}
 }/*M3_ADJUS*/ 
 void Yadjust_ta_c()
@@ -304 +369 @@
                                  for (int Yws=0; Yws<YNBS_ta_c; ++Yws){
                                          Ywish_ta_c(Yws, Yw1, Yw2, Yw3) = val;}}}}
+}/*M3_ADJUS*/ 
+void Yadjust_sa_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1) 
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2) 
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3) 
+         for (int Yws=0; Yws<YNBS_sa_c; ++Yws) 
+         { Ystate_sa_c(Yws, Yw1, Yw2, Yw3) -= Yepsi_sa_c(Yws, Yw1, Yw2, Yw3) * Ygrad_sa_c(Yws, Yw1, Yw2, Yw3);
+        }
+}/*M3_GCTOTB  */ 
+void YgradCTOtab_sa_c(YREAL tab[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         tab[Y3windice] += YG_sa_c(Yws, Yw1, Yw2, Yw3); ++Y3windice;}}}}
+}/*M3_VSTA*/ 
+void Y3valstate_sa_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         Y3x[Y3windice] = Ysa_c(Yw1, Yw2, Yw3)->Ystate[Yws]; ++Y3windice;}}}}
+}/*M3_GSTA*/ 
+void Y3getstate_sa_c(float x[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         Ysa_c(Yw1, Yw2, Yw3)->Ystate[Yws] = x[Y3windice]; ++Y3windice;}}}}
+}/*M3_VGRAD*/ 
+void Y3valgrad_sa_c(float g[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         g[Y3windice] = Ysa_c(Yw1, Yw2, Yw3)->Ygrad[Yws]; ++Y3windice;}}}}
 }/*M3_TBTOG   */ 
 void YtabTOgrad_sa_c(YREAL tab[])
@@ -417 +523 @@
 void Yio_sa_c(int Yws, int Yw1, int Yw2, int Yw3, int Ywt, double val)  
 {  Yiorwf ("sa_c", Yws, Yw1, Yw2, Yw3, Ywt, &YS_sa_c(Yws, Yw1, Yw2, Yw3), val);
+}/*M0_OUTOB*/ 
+int Youtoobs_sa_c(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("sa_c");
+         Yaobs.smod = Yws;/*M3_OUTOB*/ 
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3)
+         {      if(select_io(yiokind, "sa_c", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_sa_c(Yws, Yw1, Yw2, Yw3)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_sa_c(Yws, Yw1, Yw2, Yw3);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
+}/*M3_SEPS*/ 
+void Ysetepsi_sa_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         Ysa_c(Yw1, Yw2, Yw3)->Yepsi[Yws] = val;}}}}
 }/*M3_CREY*/ 
 void Ycreate_sa_c()  
@@ -424 +554 @@
                          for (int Yw3=0; Yw3<YA3_S3d; ++Yw3){
                                  if ((Ysa_c(Yw1, Yw2, Yw3) = new Yaosa_c ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_sa_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sa_c; ++Yws){
+                                         Ywish_sa_c(Yws, Yw1, Yw2, Yw3) = val;}}}}
+}/*M3_ADJUS*/ 
+void Yadjust_ua_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1) 
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2) 
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3) 
+         for (int Yws=0; Yws<YNBS_ua_c; ++Yws) 
+         { Ystate_ua_c(Yws, Yw1, Yw2, Yw3) -= Yepsi_ua_c(Yws, Yw1, Yw2, Yw3) * Ygrad_ua_c(Yws, Yw1, Yw2, Yw3);
+        }
+}/*M3_GCTOTB  */ 
+void YgradCTOtab_ua_c(YREAL tab[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         tab[Y3windice] += YG_ua_c(Yws, Yw1, Yw2, Yw3); ++Y3windice;}}}}
+}/*M3_VSTA*/ 
+void Y3valstate_ua_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         Y3x[Y3windice] = Yua_c(Yw1, Yw2, Yw3)->Ystate[Yws]; ++Y3windice;}}}}
+}/*M3_GSTA*/ 
+void Y3getstate_ua_c(float x[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         Yua_c(Yw1, Yw2, Yw3)->Ystate[Yws] = x[Y3windice]; ++Y3windice;}}}}
+}/*M3_VGRAD*/ 
+void Y3valgrad_ua_c(float g[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         g[Y3windice] = Yua_c(Yw1, Yw2, Yw3)->Ygrad[Yws]; ++Y3windice;}}}}
 }/*M3_TBTOG   */ 
 void YtabTOgrad_ua_c(YREAL tab[])
@@ -537 +716 @@
 void Yio_ua_c(int Yws, int Yw1, int Yw2, int Yw3, int Ywt, double val)  
 {  Yiorwf ("ua_c", Yws, Yw1, Yw2, Yw3, Ywt, &YS_ua_c(Yws, Yw1, Yw2, Yw3), val);
+}/*M0_OUTOB*/ 
+int Youtoobs_ua_c(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("ua_c");
+         Yaobs.smod = Yws;/*M3_OUTOB*/ 
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3)
+         {      if(select_io(yiokind, "ua_c", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_ua_c(Yws, Yw1, Yw2, Yw3)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_ua_c(Yws, Yw1, Yw2, Yw3);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
+}/*M3_SEPS*/ 
+void Ysetepsi_ua_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         Yua_c(Yw1, Yw2, Yw3)->Yepsi[Yws] = val;}}}}
 }/*M3_CREY*/ 
 void Ycreate_ua_c()  
@@ -544 +747 @@
                          for (int Yw3=0; Yw3<YA3_S3d; ++Yw3){
                                  if ((Yua_c(Yw1, Yw2, Yw3) = new Yaoua_c ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_ua_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ua_c; ++Yws){
+                                         Ywish_ua_c(Yws, Yw1, Yw2, Yw3) = val;}}}}
+}/*M3_ADJUS*/ 
+void Yadjust_va_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1) 
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2) 
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3) 
+         for (int Yws=0; Yws<YNBS_va_c; ++Yws) 
+         { Ystate_va_c(Yws, Yw1, Yw2, Yw3) -= Yepsi_va_c(Yws, Yw1, Yw2, Yw3) * Ygrad_va_c(Yws, Yw1, Yw2, Yw3);
+        }
+}/*M3_GCTOTB  */ 
+void YgradCTOtab_va_c(YREAL tab[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         tab[Y3windice] += YG_va_c(Yws, Yw1, Yw2, Yw3); ++Y3windice;}}}}
+}/*M3_VSTA*/ 
+void Y3valstate_va_c()
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         Y3x[Y3windice] = Yva_c(Yw1, Yw2, Yw3)->Ystate[Yws]; ++Y3windice;}}}}
+}/*M3_GSTA*/ 
+void Y3getstate_va_c(float x[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         Yva_c(Yw1, Yw2, Yw3)->Ystate[Yws] = x[Y3windice]; ++Y3windice;}}}}
+}/*M3_VGRAD*/ 
+void Y3valgrad_va_c(float g[])
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         g[Y3windice] = Yva_c(Yw1, Yw2, Yw3)->Ygrad[Yws]; ++Y3windice;}}}}
 }/*M3_TBTOG   */ 
 void YtabTOgrad_va_c(YREAL tab[])
@@ -657 +909 @@
 void Yio_va_c(int Yws, int Yw1, int Yw2, int Yw3, int Ywt, double val)  
 {  Yiorwf ("va_c", Yws, Yw1, Yw2, Yw3, Ywt, &YS_va_c(Yws, Yw1, Yw2, Yw3), val);
+}/*M0_OUTOB*/ 
+int Youtoobs_va_c(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("va_c");
+         Yaobs.smod = Yws;/*M3_OUTOB*/ 
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3d; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3d; ++Yw3)
+         {      if(select_io(yiokind, "va_c", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_va_c(Yws, Yw1, Yw2, Yw3)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_va_c(Yws, Yw1, Yw2, Yw3);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
+}/*M3_SEPS*/ 
+void Ysetepsi_va_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         Yva_c(Yw1, Yw2, Yw3)->Yepsi[Yws] = val;}}}}
 }/*M3_CREY*/ 
 void Ycreate_va_c()  
@@ -664 +940 @@
                          for (int Yw3=0; Yw3<YA3_S3d; ++Yw3){
                                  if ((Yva_c(Yw1, Yw2, Yw3) = new Yaova_c ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_va_c(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3d; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3d;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3d;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_va_c; ++Yws){
+                                         Ywish_va_c(Yws, Yw1, Yw2, Yw3) = val;}}}}
 }/*M2_TBTOGT  */ 
 void YtabTOgrad_sbcgyre_qsr_qns(int frompdt, int topdt, YREAL tab[])
@@ -6001 +6285 @@
          }
          return(nbKo);
+}/*M0_OUTOB*/ 
+int Youtoobs_sb(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("sb");
+         Yaobs.smod = Yws;/*M3_OUTOBT*/
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3dt; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3)
+         {      if(select_io(yiokind, "sb", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_sb(Yws, Yw1, Yw2, Yw3, Ywt)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_sb(Yws, Yw1, Yw2, Yw3, Ywt);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
 }/*M3_CREU*/ 
 void Ycreate_sb()  
@@ -6008 +6308 @@
                          for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3){
                                  if ((Ysb(Yw1, Yw2, Yw3) = new sb ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_sb(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3dt;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3dt;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_sb; ++Yws){
+                                         Ywish_sb(Yws, Yw1, Yw2, Yw3) = val;}}}}
 }/*M3_TBTOGT  */ 
 void YtabTOgrad_rhd(int frompdt, int topdt, YREAL tab[])
@@ -12393 +12701 @@
          }
          return(nbKo);
+}/*M0_OUTOB*/ 
+int Youtoobs_sshb(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("sshb");
+         Yaobs.smod = Yws;/*M2_OUTOBT*/
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3dt; ++Yw2)
+         {      if(select_io(yiokind, "sshb", Yws, Yw1, Yw2, -1, Ywt, &Ystate_sshb(Yws, Yw1, Yw2, Ywt)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = -1;
+                                Yaobs.vobs = Ystate_sshb(Yws, Yw1, Yw2, Ywt);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
 }/*M2_CREU*/ 
 void Ycreate_sshb()  
@@ -12399 +12722 @@
                  for (int Yw2=0; Yw2<YA2_S3dt; ++Yw2){
                          if ((Ysshb(Yw1, Yw2)= new sshb ())==NULL) Ycreate_errnew();}}
+}/*M2_SWISH*/ 
+void Ysetwish_sshb(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3dt;  ++Yw2){
+                         for (int Yws=0; Yws<YNBS_sshb; ++Yws){
+                                 Ywish_sshb(Yws, Yw1, Yw2) = val;}}}
 }/*M3_TBTOGT  */ 
 void YtabTOgrad_ub(int frompdt, int topdt, YREAL tab[])
@@ -12548 +12878 @@
          }
          return(nbKo);
+}/*M0_OUTOB*/ 
+int Youtoobs_ub(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("ub");
+         Yaobs.smod = Yws;/*M3_OUTOBT*/
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3dt; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3)
+         {      if(select_io(yiokind, "ub", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_ub(Yws, Yw1, Yw2, Yw3, Ywt)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_ub(Yws, Yw1, Yw2, Yw3, Ywt);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
 }/*M3_CREU*/ 
 void Ycreate_ub()  
@@ -12555 +12901 @@
                          for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3){
                                  if ((Yub(Yw1, Yw2, Yw3) = new ub ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_ub(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3dt;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3dt;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_ub; ++Yws){
+                                         Ywish_ub(Yws, Yw1, Yw2, Yw3) = val;}}}}
 }/*M3_TBTOGT  */ 
 void YtabTOgrad_vb(int frompdt, int topdt, YREAL tab[])
@@ -12704 +13058 @@
          }
          return(nbKo);
+}/*M0_OUTOB*/ 
+int Youtoobs_vb(YioKind yiokind, int Yws, int Ywt, int arbpdt)
+{
+         Yaobs.time = arbpdt;
+         Yaobs.imod = Yimod("vb");
+         Yaobs.smod = Yws;/*M3_OUTOBT*/
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1)
+         for (int Yw2=0; Yw2<YA2_S3dt; ++Yw2)
+         for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3)
+         {      if(select_io(yiokind, "vb", Yws, Yw1, Yw2, Yw3, Ywt, &Ystate_vb(Yws, Yw1, Yw2, Yw3, Ywt)))
+                        {       Yaobs.iaxe = Yw1; Yaobs.jaxe = Yw2; Yaobs.kaxe = Yw3;
+                                Yaobs.vobs = Ystate_vb(Yws, Yw1, Yw2, Yw3, Ywt);
+                                if(!Yobs_insert (&Yaobs)) return(0);
+                        }
+         }/*M9_OUTOB*/  
+         return(1);
 }/*M3_CREU*/ 
 void Ycreate_vb()  
@@ -12711 +13081 @@
                          for (int Yw3=0; Yw3<YA3_S3dt; ++Yw3){
                                  if ((Yvb(Yw1, Yw2, Yw3) = new vb ())==NULL) Ycreate_errnew();}}}
+}/*M3_SWISH*/ 
+void Ysetwish_vb(double val)
+{
+         for (int Yw1=0; Yw1<YA1_S3dt; ++Yw1){
+                 for (int Yw2=0; Yw2<YA2_S3dt;  ++Yw2){
+                         for (int Yw3=0; Yw3<YA3_S3dt;  ++Yw3){
+                                 for (int Yws=0; Yws<YNBS_vb; ++Yws){
+                                         Ywish_vb(Yws, Yw1, Yw2, Yw3) = val;}}}}
 }/*M3_TBTOGT  */ 
 void YtabTOgrad_hdivn(int frompdt, int topdt, YREAL tab[])
@@ -13273 +13651 @@
 {       
          if(1==0);
+         else if (strcmp(nmmod, "sshn_c") == 0)
+                                 YW_sshn_c(Yws, Yw1, Yw2) = YS_sshn_c(Yws, Yw1, Yw2) - vobs;
          else if (strcmp(nmmod, "ta_c") == 0)
                                  YW_ta_c(Yws, Yw1, Yw2, Yw3) = YS_ta_c(Yws, Yw1, Yw2, Yw3) - vobs;
+         else if (strcmp(nmmod, "sa_c") == 0)
+                                 YW_sa_c(Yws, Yw1, Yw2, Yw3) = YS_sa_c(Yws, Yw1, Yw2, Yw3) - vobs;
+         else if (strcmp(nmmod, "ua_c") == 0)
+                                 YW_ua_c(Yws, Yw1, Yw2, Yw3) = YS_ua_c(Yws, Yw1, Yw2, Yw3) - vobs;
+         else if (strcmp(nmmod, "va_c") == 0)
+                                 YW_va_c(Yws, Yw1, Yw2, Yw3) = YS_va_c(Yws, Yw1, Yw2, Yw3) - vobs;
          else if (strcmp(nmmod, "tb") == 0)
                                  YW_tb(Yws, Yw1, Yw2, Yw3) = YS_tb(Yws, Yw1, Yw2, Yw3, Ywt) - vobs;
+         else if (strcmp(nmmod, "sb") == 0)
+                                 YW_sb(Yws, Yw1, Yw2, Yw3) = YS_sb(Yws, Yw1, Yw2, Yw3, Ywt) - vobs;
+         else if (strcmp(nmmod, "sshb") == 0)
+                                 YW_sshb(Yws, Yw1, Yw2) = YS_sshb(Yws, Yw1, Yw2, Ywt) - vobs;
+         else if (strcmp(nmmod, "ub") == 0)
+                                 YW_ub(Yws, Yw1, Yw2, Yw3) = YS_ub(Yws, Yw1, Yw2, Yw3, Ywt) - vobs;
+         else if (strcmp(nmmod, "vb") == 0)
+                                 YW_vb(Yws, Yw1, Yw2, Yw3) = YS_vb(Yws, Yw1, Yw2, Yw3, Ywt) - vobs;
 }
 void Ycostwishdiff_all (char *nmmod, int Yws, int Yw1, int Yw2, int Yw3, int Ywt) 
 {       
          if(1==0);
+         else if (strcmp(nmmod, "sshn_c") == 0)
+                                 YG_sshn_c(Yws, Yw1, Yw2) += Ycostdiff(YW_sshn_c(Yws, Yw1, Yw2), YW_sshn_c(Yws, Yw1, Yw2));
          else if (strcmp(nmmod, "ta_c") == 0)
                                  YG_ta_c(Yws, Yw1, Yw2, Yw3) += Ycostdiff(YW_ta_c(Yws, Yw1, Yw2, Yw3), YW_ta_c(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "sa_c") == 0)
+                                 YG_sa_c(Yws, Yw1, Yw2, Yw3) += Ycostdiff(YW_sa_c(Yws, Yw1, Yw2, Yw3), YW_sa_c(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "ua_c") == 0)
+                                 YG_ua_c(Yws, Yw1, Yw2, Yw3) += Ycostdiff(YW_ua_c(Yws, Yw1, Yw2, Yw3), YW_ua_c(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "va_c") == 0)
+                                 YG_va_c(Yws, Yw1, Yw2, Yw3) += Ycostdiff(YW_va_c(Yws, Yw1, Yw2, Yw3), YW_va_c(Yws, Yw1, Yw2, Yw3));
          else if (strcmp(nmmod, "tb") == 0)
                                  YG_tb(Yws, Yw1, Yw2, Yw3, Ywt) += Ycostdiff(YW_tb(Yws, Yw1, Yw2, Yw3), YW_tb(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "sb") == 0)
+                                 YG_sb(Yws, Yw1, Yw2, Yw3, Ywt) += Ycostdiff(YW_sb(Yws, Yw1, Yw2, Yw3), YW_sb(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "sshb") == 0)
+                                      YG_sshb(Yws, Yw1, Yw2, Ywt) += Ycostdiff(YW_sshb(Yws, Yw1, Yw2), YW_sshb(Yws, Yw1, Yw2));
+         else if (strcmp(nmmod, "ub") == 0)
+                                 YG_ub(Yws, Yw1, Yw2, Yw3, Ywt) += Ycostdiff(YW_ub(Yws, Yw1, Yw2, Yw3), YW_ub(Yws, Yw1, Yw2, Yw3));
+         else if (strcmp(nmmod, "vb") == 0)
+                                 YG_vb(Yws, Yw1, Yw2, Yw3, Ywt) += Ycostdiff(YW_vb(Yws, Yw1, Yw2, Yw3), YW_vb(Yws, Yw1, Yw2, Yw3));
 }
 void Youtoobs_mod(YioKind yiokind, char *nmmod, int numout, int pdt, int arbpdt)
 {
          if(1==0);
+         else if (strcmp(nmmod, "sshn_c") == 0) Youtoobs_sshn_c(yiokind, numout, pdt, arbpdt);
          else if (strcmp(nmmod, "ta_c") == 0) Youtoobs_ta_c(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "sa_c") == 0) Youtoobs_sa_c(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "ua_c") == 0) Youtoobs_ua_c(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "va_c") == 0) Youtoobs_va_c(yiokind, numout, pdt, arbpdt);
          else if (strcmp(nmmod, "tb") == 0) Youtoobs_tb(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "sb") == 0) Youtoobs_sb(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "sshb") == 0) Youtoobs_sshb(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "ub") == 0) Youtoobs_ub(yiokind, numout, pdt, arbpdt);
+         else if (strcmp(nmmod, "vb") == 0) Youtoobs_vb(yiokind, numout, pdt, arbpdt);
 }
 void Yadjust_all () 
 {
+         Yadjust_sshn_c ();
          Yadjust_ta_c ();
+         Yadjust_sa_c ();
+         Yadjust_ua_c ();
+         Yadjust_va_c ();
 }
 void Yrazgrad_all () 
@@ -13575 +13997 @@
 void Ysetwish_mod (int imod, YREAL val) 
 {       if(1==0);
+        else if (imod==0) Ysetwish_sshn_c(val);
         else if (imod==1) Ysetwish_ta_c(val);
+        else if (imod==2) Ysetwish_sa_c(val);
+        else if (imod==3) Ysetwish_ua_c(val);
+        else if (imod==4) Ysetwish_va_c(val);
         else if (imod==38) Ysetwish_tb(val);
+        else if (imod==39) Ysetwish_sb(val);
+        else if (imod==81) Ysetwish_sshb(val);
+        else if (imod==82) Ysetwish_ub(val);
+        else if (imod==83) Ysetwish_vb(val);
 }
 void  Yio_mod (char *nmmod, int Yws, int Yw1, int Yw2, int Yw3, int Ywt, double val)
@@ -13671 +14101 @@
 void YgradCTOtab_target (YREAL tab[]) 
 {       //Y3windice = 0;
+         YgradCTOtab_sshn_c (tab);
          YgradCTOtab_ta_c (tab);
+         YgradCTOtab_sa_c (tab);
+         YgradCTOtab_ua_c (tab);
+         YgradCTOtab_va_c (tab);
 }
 void YtabTOgrad_target (YREAL tab[]) 
 {       //Y3windice = 0;
+         YtabTOgrad_sshn_c (tab);
          YtabTOgrad_ta_c (tab);
+         YtabTOgrad_sa_c (tab);
+         YtabTOgrad_ua_c (tab);
+         YtabTOgrad_va_c (tab);
 }
 void Y3getstate_all (float x[]) 
 {        Y3windice = 0;
+         Y3getstate_sshn_c (x);
          Y3getstate_ta_c (x);
+         Y3getstate_sa_c (x);
+         Y3getstate_ua_c (x);
+         Y3getstate_va_c (x);
 }
 void Y3valstate_all () 
 {        Y3windice = 0;
+         Y3valstate_sshn_c ();
          Y3valstate_ta_c ();
+         Y3valstate_sa_c ();
+         Y3valstate_ua_c ();
+         Y3valstate_va_c ();
 }
 void Y3valgrad_all (float g[]) 
 {        Y3windice = 0;
+         Y3valgrad_sshn_c (g);
          Y3valgrad_ta_c (g);
+         Y3valgrad_sa_c (g);
+         Y3valgrad_ua_c (g);
+         Y3valgrad_va_c (g);
 }
 void YdeltaEQPstate_traj(int itraj, char *norkmod, int frompdt, int topdt, double pfact) 
@@ -13694 +14144 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YdeltaEQPstate_sshn_c (0, 1, pfact);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YdeltaEQPstate_ta_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YdeltaEQPstate_sa_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YdeltaEQPstate_ua_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YdeltaEQPstate_va_c (0, 1, pfact);
         }
@@ -13775 +14225 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YdeltaEQPstate_tb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YdeltaEQPstate_sb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -13859 +14309 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
          YdeltaEQPstate_sshn (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YdeltaEQPstate_sshb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YdeltaEQPstate_ub (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YdeltaEQPstate_vb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -13875 +14325 @@
 void YdeltaEQPstate_target(double pfact) 
 {
+         YdeltaEQPstate_sshn_c (0, 1, pfact);
          YdeltaEQPstate_ta_c (0, 1, pfact);
+         YdeltaEQPstate_sa_c (0, 1, pfact);
+         YdeltaEQPstate_ua_c (0, 1, pfact);
+         YdeltaEQPstate_va_c (0, 1, pfact);
 }
 void YdeltaEQPgrad_target(double pfact) 
 {
+         YdeltaEQPgrad_sshn_c (0, 1, pfact);
          YdeltaEQPgrad_ta_c (0, 1, pfact);
+         YdeltaEQPgrad_sa_c (0, 1, pfact);
+         YdeltaEQPgrad_ua_c (0, 1, pfact);
+         YdeltaEQPgrad_va_c (0, 1, pfact);
 }
 void YstateEQPdelta_traj(int itraj, char *norkmod, int frompdt, int topdt, double pfact) 
@@ -13886 +14344 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateEQPdelta_sshn_c (0, 1, pfact);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateEQPdelta_ta_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateEQPdelta_sa_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateEQPdelta_ua_c (0, 1, pfact);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateEQPdelta_va_c (0, 1, pfact);
         }
@@ -13967 +14425 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateEQPdelta_tb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateEQPdelta_sb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -14051 +14509 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
          YstateEQPdelta_sshn (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateEQPdelta_sshb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateEQPdelta_ub (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateEQPdelta_vb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -14067 +14525 @@
 void YstateEQPdelta_target(double pfact) 
 {
+         YstateEQPdelta_sshn_c (0, 1, pfact);
          YstateEQPdelta_ta_c (0, 1, pfact);
+         YstateEQPdelta_sa_c (0, 1, pfact);
+         YstateEQPdelta_ua_c (0, 1, pfact);
+         YstateEQPdelta_va_c (0, 1, pfact);
 }
 void YstateEQPOdelta_target(double pfact, char *codop) 
 {
+         YstateEQPOdelta_sshn_c (0, 1, pfact, codop);
          YstateEQPOdelta_ta_c (0, 1, pfact, codop);
+         YstateEQPOdelta_sa_c (0, 1, pfact, codop);
+         YstateEQPOdelta_ua_c (0, 1, pfact, codop);
+         YstateEQPOdelta_va_c (0, 1, pfact, codop);
 }
 void YstateEQAPTdelta_target(double pfact, YREAL tab[]) 
 {
+         YstateEQAPTdelta_sshn_c (0, 1, pfact, tab);
          YstateEQAPTdelta_ta_c (0, 1, pfact, tab);
+         YstateEQAPTdelta_sa_c (0, 1, pfact, tab);
+         YstateEQAPTdelta_ua_c (0, 1, pfact, tab);
+         YstateEQAPTdelta_va_c (0, 1, pfact, tab);
 }
 void YgradEQPstate_traj(int itraj, char *norkmod, int frompdt, int topdt, double pfact) 
@@ -14082 +14552 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradEQPstate_sshn_c(pfact);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradEQPstate_ta_c(pfact);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradEQPstate_sa_c(pfact);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradEQPstate_ua_c(pfact);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradEQPstate_va_c(pfact);
         }
@@ -14163 +14633 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradEQPstate_tb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradEQPstate_sb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -14247 +14717 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
          YgradEQPstate_sshn (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradEQPstate_sshb (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradEQPstate_ub (frompdt, topdt, pfact);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradEQPstate_vb (frompdt, topdt, pfact);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -14263 +14733 @@
 void YgradEQPstate_target(double pfact) 
 {
+         YgradEQPstate_sshn_c (pfact);
          YgradEQPstate_ta_c (pfact);
+         YgradEQPstate_sa_c (pfact);
+         YgradEQPstate_ua_c (pfact);
+         YgradEQPstate_va_c (pfact);
 }
 void YgradEQPOstate_target(double pfact, char *codop) 
 {
+         YgradEQPOstate_sshn_c (pfact, codop);
          YgradEQPOstate_ta_c (pfact, codop);
+         YgradEQPOstate_sa_c (pfact, codop);
+         YgradEQPOstate_ua_c (pfact, codop);
+         YgradEQPOstate_va_c (pfact, codop);
 }
 void YstateTOtab_traj (int itraj, char *norkmod, int frompdt, int topdt, YREAL tab[]) 
@@ -14274 +14752 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateTOtab_sshn_c (tab);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateTOtab_ta_c (tab);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateTOtab_sa_c (tab);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateTOtab_ua_c (tab);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YstateTOtab_va_c (tab);
         }
@@ -14355 +14833 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateTOtab_tb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateTOtab_sb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -14439 +14917 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
          YstateTOtab_sshn (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateTOtab_sshb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateTOtab_ub (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YstateTOtab_vb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -14455 +14933 @@
 void YstateTOtab_target (YREAL tab[]) 
 {       //Y3windice = 0;
+         YstateTOtab_sshn_c (tab);
          YstateTOtab_ta_c (tab);
+         YstateTOtab_sa_c (tab);
+         YstateTOtab_ua_c (tab);
+         YstateTOtab_va_c (tab);
 }
 void YgradTOtab_traj (int itraj, char *norkmod, int frompdt, int topdt, YREAL tab[]) 
@@ -14462 +14944 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradTOtab_sshn_c (tab);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradTOtab_ta_c (tab);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradTOtab_sa_c (tab);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradTOtab_ua_c (tab);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
          YgradTOtab_va_c (tab);
         }
@@ -14543 +15025 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradTOtab_tb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradTOtab_sb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -14627 +15109 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
          YgradTOtab_sshn (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradTOtab_sshb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradTOtab_ub (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
          YgradTOtab_vb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -14643 +15125 @@
 void YgradTOtab_target (YREAL tab[]) 
 {       //Y3windice = 0;
+         YgradTOtab_sshn_c (tab);
          YgradTOtab_ta_c (tab);
+         YgradTOtab_sa_c (tab);
+         YgradTOtab_ua_c (tab);
+         YgradTOtab_va_c (tab);
 }
 void YtabTOgrad_traj (int itraj, char *norkmod, int frompdt, int topdt, YREAL tab[]) 
@@ -14650 +15136 @@
         else if (itraj==Yid_Tcst)
         {
-                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshn_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
                          YtabTOgrad_sshn_c (tab);
                 if ( !strcmp(norkmod, "ta_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
                          YtabTOgrad_ta_c (tab);
-                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sa_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
                          YtabTOgrad_sa_c (tab);
-                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ua_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
                          YtabTOgrad_ua_c (tab);
-                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "va_c") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#T") )
                          YtabTOgrad_va_c (tab);
         }
@@ -14731 +15217 @@
                 if ( !strcmp(norkmod, "tb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
                          YtabTOgrad_tb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
                          YtabTOgrad_sb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "rhd") || !strcmp(norkmod, "Y#A") )
@@ -14815 +15301 @@
                 if ( !strcmp(norkmod, "sshn") || !strcmp(norkmod, "Y#A") )
                          YtabTOgrad_sshn (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "sshb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
                          YtabTOgrad_sshb (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "ub") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
                          YtabTOgrad_ub (frompdt, topdt, tab);
-                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") )
+                if ( !strcmp(norkmod, "vb") || !strcmp(norkmod, "Y#A") || !strcmp(norkmod, "Y#C") )
                          YtabTOgrad_vb (frompdt, topdt, tab);
                 if ( !strcmp(norkmod, "hdivn") || !strcmp(norkmod, "Y#A") )
@@ -15009 +15495 @@
          {
                          if (!strcmp(argv[0], "setepsi_all") || !strcmp(argv[0], "SETEPSI_ALL")){all=1; val=atof(argv[1]);} else val=atof(argv[2]);
+                         if (!strcmp(argv[1], "sshn_c") || all)
+                                         {Ysetepsi_sshn_c(val);codret=1;}
                          if (!strcmp(argv[1], "ta_c") || all)
                                          {Ysetepsi_ta_c(val);codret=1;}
+                         if (!strcmp(argv[1], "sa_c") || all)
+                                         {Ysetepsi_sa_c(val);codret=1;}
+                         if (!strcmp(argv[1], "ua_c") || all)
+                                         {Ysetepsi_ua_c(val);codret=1;}
+                         if (!strcmp(argv[1], "va_c") || all)
+                                         {Ysetepsi_va_c(val);codret=1;}
          }
          else codret=0;
@@ -15025 +15519 @@
          Yting[0]=YS1_tb( Yi, Yj, 0, YTemps-1);
          Ysbcgyre_qsr_qns(Yi, Yj)->forward( Yting[0] );
+         Ydbg_nanf ("F: ", YNBI_sbcgyre_qsr_qns, "sbcgyre_qsr_qns");
          Ysbcgyre_emp1(Yi, Yj)->forward();
          if (1==0 || Yi-1<0)
@@ -15044 +15539 @@
          Yting[4]=YS1_sbcgyre_emp1( Yi, Yj, YTemps);
          Ysbcgyre_zsumemp_zsurf(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_sbcgyre_zsumemp_zsurf, "sbcgyre_zsumemp_zsurf");
 
 }
@@ -15053 +15549 @@
          Yting[2]=YS2_sbcgyre_zsumemp_zsurf( 31, 21, YTemps);
          Ysbcgyre_emp(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_sbcgyre_emp, "sbcgyre_emp");
          Yting[0]=YS1_sbcgyre_emp( Yi, Yj, YTemps);
          Ysbcgyre_emps(Yi, Yj)->forward( Yting[0] );
+         Ydbg_nanf ("F: ", YNBI_sbcgyre_emps, "sbcgyre_emps");
          Ysbcgyre_utau_vtau(Yi, Yj)->forward();
          if (1==0 || Yi-1<0)
@@ -15067 +15565 @@
          Yting[3]=YS2_sbcgyre_utau_vtau( Yi, Yj, YTemps);
          Ysbcgyre_wndm(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_sbcgyre_wndm, "sbcgyre_wndm");
 
 }
@@ -15084 +15583 @@
          Yting[3]=YS1_sb( Yi, Yj, Yk-1, YTemps-1);
          Ybn2_rn2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_bn2_rn2, "bn2_rn2");
 
 }
@@ -15152 +15652 @@
          Yting[18]=YS1_va( Yi+1, Yj, 1, YTemps-1);
          Yzdf_avt_avmu_avmv(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5], Yting[6], Yting[7], Yting[8], Yting[9], Yting[10], Yting[11], Yting[12], Yting[13], Yting[14], Yting[15], Yting[16], Yting[17], Yting[18] );
+         Ydbg_nanf ("F: ", YNBI_zdf_avt_avmu_avmv, "zdf_avt_avmu_avmv");
 
 }
@@ -15189 +15690 @@
          Yting[30]=YS1_zdf_avt_avmu_avmv( Yi, Yj, 30, YTemps);
          Yzdfmxl_hmld(Yi, Yj)->forward();
+         Ydbg_nanf ("F: ", YNBI_zdfmxl_hmld, "zdfmxl_hmld");
          Yting[0]=YS1_rhop( Yi, Yj, 0, YTemps-1);
          Yting[1]=YS1_rhop( Yi, Yj, 1, YTemps-1);
@@ -15221 +15723 @@
          Yting[30]=YS1_rhop( Yi, Yj, 30, YTemps-1);
          Yzdfmxl_nmln_hmlp_hmlpt(Yi, Yj)->forward();
+         Ydbg_nanf ("F: ", YNBI_zdfmxl_nmln_hmlp_hmlpt, "zdfmxl_nmln_hmlp_hmlpt");
 
 }
@@ -15230 +15733 @@
          Yting[2]=YS1_sa( Yi, Yj, 0, YTemps-1);
          Yta_sa_trasbc(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ta_sa_trasbc, "ta_sa_trasbc");
 
 }
@@ -15239 +15743 @@
          Yting[1]=YS1_ta_sa_trasbc( Yi, Yj, YTemps);
          Yta_traqsr(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_ta_traqsr, "ta_traqsr");
 
 }
@@ -15258 +15763 @@
          Yting[4]=YS1_ta( Yi+1, Yj, Yk, YTemps-1);
          Yzcent_hor_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_zcent_hor_traadv_cen2, "zcent_hor_traadv_cen2");
          Yting[0]=YS1_ua( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_va( Yi, Yj, Yk, YTemps-1);
@@ -15270 +15776 @@
          Yting[4]=YS1_sa( Yi+1, Yj, Yk, YTemps-1);
          Yzcens_hor_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_zcens_hor_traadv_cen2, "zcens_hor_traadv_cen2");
 
 }
@@ -15287 +15794 @@
          Yting[4]=YS2_zcent_hor_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yta_hor_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_ta_hor_traadv_cen2, "ta_hor_traadv_cen2");
          Yting[0]=YS2_ta_sa_trasbc( Yi, Yj, YTemps);
          if (1==0 || Yi-1<0)
@@ -15299 +15807 @@
          Yting[4]=YS2_zcens_hor_traadv_cen2( Yi, Yj, Yk, YTemps);
          Ysa_hor_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_sa_hor_traadv_cen2, "sa_hor_traadv_cen2");
 
 }
@@ -15314 +15823 @@
          Yting[2]=YS1_ta( Yi, Yj, Yk-1, YTemps-1);
          Yzcent_ver_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_zcent_ver_traadv_cen2, "zcent_ver_traadv_cen2");
          Yting[0]=YS1_wa( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_sa( Yi, Yj, Yk, YTemps-1);
@@ -15321 +15831 @@
          Yting[2]=YS1_sa( Yi, Yj, Yk-1, YTemps-1);
          Yzcens_ver_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_zcens_ver_traadv_cen2, "zcens_ver_traadv_cen2");
 
 }
@@ -15334 +15845 @@
          Yting[2]=YS1_zcent_ver_traadv_cen2( Yi, Yj, Yk+1, YTemps);
          Yta_ver_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ta_ver_traadv_cen2, "ta_ver_traadv_cen2");
          Yting[0]=YS1_sa_hor_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zcens_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
@@ -15341 +15853 @@
          Yting[2]=YS1_zcens_ver_traadv_cen2( Yi, Yj, Yk+1, YTemps);
          Ysa_ver_traadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_sa_ver_traadv_cen2, "sa_ver_traadv_cen2");
 
 }
@@ -15357 +15870 @@
          Yting[2]=YS1_tb( Yi, Yj+1, Yk, YTemps-1);
          Yztuv_traldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ztuv_traldf_lap, "ztuv_traldf_lap");
          Yting[0]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          if (1==0 || Yi+1>YA1_S3dt-1)
@@ -15367 +15881 @@
          Yting[2]=YS1_sb( Yi, Yj+1, Yk, YTemps-1);
          Yzsuv_traldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_zsuv_traldf_lap, "zsuv_traldf_lap");
          Yting[0]=YS1_ta_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ztuv_traldf_lap( Yi, Yj, Yk, YTemps);
@@ -15379 +15894 @@
          Yting[4]=YS2_ztuv_traldf_lap( Yi, Yj-1, Yk, YTemps);
          Yta_traldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_ta_traldf_lap, "ta_traldf_lap");
          Yting[0]=YS1_sa_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zsuv_traldf_lap( Yi, Yj, Yk, YTemps);
@@ -15391 +15907 @@
          Yting[4]=YS2_zsuv_traldf_lap( Yi, Yj-1, Yk, YTemps);
          Ysa_traldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_sa_traldf_lap, "sa_traldf_lap");
 
 }
@@ -15403 +15920 @@
          Yting[1]=YS1_zdf_avt_avmu_avmv( Yi, Yj, Yk+1, YTemps);
          Yzwisd_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_zwisd_trazdf_imp, "zwisd_trazdf_imp");
          Yting[0]=YS1_ta_traldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_tb( Yi, Yj, Yk, YTemps-1);
          Yzrhs_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_zrhs_trazdf_imp, "zrhs_trazdf_imp");
          Yting[0]=YS1_sa_traldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          Yzrhs_sa_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_zrhs_sa_trazdf_imp, "zrhs_sa_trazdf_imp");
 
 }
@@ -15426 +15946 @@
          Yting[3]=YS1_zwt_trazdf_imp( Yi, Yj, Yk-1, YTemps);
          Yzwt_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zwt_trazdf_imp, "zwt_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -15437 +15958 @@
          Yting[3]=YS1_zwt_trazdf_imp( Yi, Yj, Yk-1, YTemps);
          Yta_de_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_ta_de_trazdf_imp, "ta_de_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -15448 +15970 @@
          Yting[3]=YS1_zwt_trazdf_imp( Yi, Yj, Yk-1, YTemps);
          Ysa_de_trazdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_sa_de_trazdf_imp, "sa_de_trazdf_imp");
 
 }
@@ -15463 +15986 @@
          Yting[4]=YS1_ta_c( Yi, Yj, Yk);
          Yta(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_ta, "ta");
          Yting[0]=YS2_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -15472 +15996 @@
          Yting[4]=YS1_sa_c( Yi, Yj, Yk);
          Ysa(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_sa, "sa");
 
 }
@@ -15483 +16008 @@
          Yting[3]=YS1_ta_c( Yi, Yj, Yk);
          Ytb(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_tb, "tb");
          Yting[0]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_sa( Yi, Yj, Yk, YTemps-1);
@@ -15488 +16014 @@
          Yting[3]=YS1_sa_c( Yi, Yj, Yk);
          Ysb(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_sb, "sb");
 
 }
@@ -15497 +16024 @@
          Yting[1]=YS1_sb( Yi, Yj, Yk, YTemps);
          Yrhd(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_rhd, "rhd");
          Yting[0]=YS1_rhd( Yi, Yj, Yk, YTemps);
          Yrhop(Yi, Yj, Yk)->forward( Yting[0] );
+         Ydbg_nanf ("F: ", YNBI_rhop, "rhop");
 
 }
@@ -15525 +16054 @@
          Yting[5]=YS1_va( Yi, Yj+1, Yk, YTemps-1);
          Yhmf_TF_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5] );
+         Ydbg_nanf ("F: ", YNBI_hmf_TF_dynadv_cen2, "hmf_TF_dynadv_cen2");
 
 }
@@ -15541 +16071 @@
          Yting[3]=YS2_hmf_TF_dynadv_cen2( Yi, Yj-1, Yk, YTemps);
          Yzua_dhmf_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zua_dhmf_dynadv_cen2, "zua_dhmf_dynadv_cen2");
          Yting[0]=YS3_hmf_TF_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -15552 +16083 @@
          Yting[3]=YS4_hmf_TF_dynadv_cen2( Yi, Yj-1, Yk, YTemps);
          Yzva_dhmf_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zva_dhmf_dynadv_cen2, "zva_dhmf_dynadv_cen2");
 
 }
@@ -15580 +16112 @@
          Yting[6]=YS1_va( Yi, Yj, Yk-1, YTemps-1);
          Yzfuv_UW_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5], Yting[6] );
+         Ydbg_nanf ("F: ", YNBI_zfuv_UW_dynadv_cen2, "zfuv_UW_dynadv_cen2");
 
 }
@@ -15593 +16126 @@
          Yting[2]=YS1_zua_dhmf_dynadv_cen2( Yi, Yj, Yk, YTemps);
          Yua_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ua_dynadv_cen2, "ua_dynadv_cen2");
          Yting[0]=YS2_zfuv_UW_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -15600 +16134 @@
          Yting[2]=YS1_zva_dhmf_dynadv_cen2( Yi, Yj, Yk, YTemps);
          Yva_dynadv_cen2(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_va_dynadv_cen2, "va_dynadv_cen2");
 
 }
@@ -15618 +16153 @@
          Yting[3]=YS1_va( Yi+1, Yj, Yk, YTemps-1);
          Yzwxyz_vor_ene(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zwxyz_vor_ene, "zwxyz_vor_ene");
 
 }
@@ -15643 +16179 @@
          Yting[6]=YS2_zwxyz_vor_ene( Yi+1, Yj, Yk, YTemps);
          Yua_vor_ene(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5], Yting[6] );
+         Ydbg_nanf ("F: ", YNBI_ua_vor_ene, "ua_vor_ene");
          Yting[0]=YS1_va_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -15663 +16200 @@
          Yting[6]=YS1_zwxyz_vor_ene( Yi, Yj+1, Yk, YTemps);
          Yva_vor_ene(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5], Yting[6] );
+         Ydbg_nanf ("F: ", YNBI_va_vor_ene, "va_vor_ene");
          Yting[0]=YS1_ua_vor_ene( Yi, Yj, Yk, YTemps);
          if (1==0 || Yj-1<0)
@@ -15675 +16213 @@
          Yting[4]=YS1_hdivn( Yi+1, Yj, Yk, YTemps-2);
          Yua_dyn_ldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_ua_dyn_ldf_lap, "ua_dyn_ldf_lap");
          Yting[0]=YS1_va_vor_ene( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -15687 +16226 @@
          Yting[4]=YS1_hdivn( Yi, Yj+1, Yk, YTemps-2);
          Yva_dyn_ldf_lap(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4] );
+         Ydbg_nanf ("F: ", YNBI_va_dyn_ldf_lap, "va_dyn_ldf_lap");
 
 }
@@ -15725 +16265 @@
          Yting[7]=YS2_zhpij_dyn_hpg_zco( Yi, Yj, Yk-1, YTemps);
          Yzhpij_dyn_hpg_zco(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3], Yting[4], Yting[5], Yting[6], Yting[7] );
+         Ydbg_nanf ("F: ", YNBI_zhpij_dyn_hpg_zco, "zhpij_dyn_hpg_zco");
          Yting[0]=YS1_ua_dyn_ldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zhpij_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yua_dyn_hpg_zco(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_ua_dyn_hpg_zco, "ua_dyn_hpg_zco");
          Yting[0]=YS1_va_dyn_ldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS2_zhpij_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yva_dyn_hpg_zco(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_va_dyn_hpg_zco, "va_dyn_hpg_zco");
 
 }
@@ -15743 +16286 @@
          Yting[1]=YS2_zdf_avt_avmu_avmv( Yi, Yj, Yk+1, YTemps);
          Yzwisd_ua_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_zwisd_ua_dynzdf_imp, "zwisd_ua_dynzdf_imp");
          Yting[0]=YS3_zdf_avt_avmu_avmv( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -15749 +16293 @@
          Yting[1]=YS3_zdf_avt_avmu_avmv( Yi, Yj, Yk+1, YTemps);
          Yzwisd_va_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_zwisd_va_dynzdf_imp, "zwisd_va_dynzdf_imp");
          Yting[0]=YS1_ua_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
          Yting[2]=YS1_sbcgyre_utau_vtau( Yi, Yj, YTemps);
          Yzrhs_ua_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_zrhs_ua_dynzdf_imp, "zrhs_ua_dynzdf_imp");
          Yting[0]=YS1_va_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
          Yting[2]=YS2_sbcgyre_utau_vtau( Yi, Yj, YTemps);
          Yzrhs_va_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_zrhs_va_dynzdf_imp, "zrhs_va_dynzdf_imp");
 
 }
@@ -15774 +16321 @@
          Yting[3]=YS1_zwt_ua_dynzdf_imp( Yi, Yj, Yk-1, YTemps);
          Yzwt_ua_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zwt_ua_dynzdf_imp, "zwt_ua_dynzdf_imp");
          Yting[0]=YS1_zwisd_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -15785 +16333 @@
          Yting[3]=YS1_zwt_ua_dynzdf_imp( Yi, Yj, Yk-1, YTemps);
          Yua_de_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_ua_de_dynzdf_imp, "ua_de_dynzdf_imp");
          Yting[0]=YS1_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -15796 +16345 @@
          Yting[3]=YS1_zwt_va_dynzdf_imp( Yi, Yj, Yk-1, YTemps);
          Yzwt_va_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_zwt_va_dynzdf_imp, "zwt_va_dynzdf_imp");
          Yting[0]=YS1_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -15807 +16357 @@
          Yting[3]=YS1_zwt_va_dynzdf_imp( Yi, Yj, Yk-1, YTemps);
          Yva_de_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_va_de_dynzdf_imp, "va_de_dynzdf_imp");
 
 }
@@ -15821 +16372 @@
          Yting[3]=YS1_zwt_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          Yua_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_ua_dynzdf_imp, "ua_dynzdf_imp");
          Yting[0]=YS2_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -15829 +16381 @@
          Yting[3]=YS1_zwt_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          Yva_dynzdf_imp(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_va_dynzdf_imp, "va_dynzdf_imp");
 
 }
@@ -15838 +16391 @@
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
          Yua_norm_dynzdf(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_ua_norm_dynzdf, "ua_norm_dynzdf");
          Yting[0]=YS1_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
          Yva_norm_dynzdf(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_va_norm_dynzdf, "va_norm_dynzdf");
 
 }
@@ -15856 +16411 @@
          Yting[2]=YS1_sshn( Yi+1, Yj, YTemps-1);
          Yspguv_now_dynspg(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_spguv_now_dynspg, "spguv_now_dynspg");
 
 }
@@ -15866 +16422 @@
          Yting[2]=YS1_spguv_now_dynspg( Yi, Yj, YTemps);
          Yua_1_dynspg_flt(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ua_1_dynspg_flt, "ua_1_dynspg_flt");
          Yting[0]=YS1_va_norm_dynzdf( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
          Yting[2]=YS2_spguv_now_dynspg( Yi, Yj, YTemps);
          Yva_1_dynspg_flt(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_va_1_dynspg_flt, "va_1_dynspg_flt");
 
 }
@@ -15907 +16465 @@
          Yting[30]=YS1_ua_1_dynspg_flt( Yi, Yj, 30, YTemps);
          Ysum_spgu_dynspg_flt(Yi, Yj)->forward();
+         Ydbg_nanf ("F: ", YNBI_sum_spgu_dynspg_flt, "sum_spgu_dynspg_flt");
          Yting[0]=YS1_va_1_dynspg_flt( Yi, Yj, 0, YTemps);
          Yting[1]=YS1_va_1_dynspg_flt( Yi, Yj, 1, YTemps);
@@ -15939 +16498 @@
          Yting[30]=YS1_va_1_dynspg_flt( Yi, Yj, 30, YTemps);
          Ysum_spgv_dynspg_flt(Yi, Yj)->forward();
+         Ydbg_nanf ("F: ", YNBI_sum_spgv_dynspg_flt, "sum_spgv_dynspg_flt");
 
 }
@@ -15955 +16515 @@
          Yting[3]=YS1_sum_spgv_dynspg_flt( Yi, Yj-1, YTemps);
          Ygcb_dynspg_flt(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_gcb_dynspg_flt, "gcb_dynspg_flt");
          Yting[0]=YS1_gcx2( Yi, Yj, YTemps-1);
          Yting[1]=YS1_gcx2( Yi, Yj, YTemps-2);
          Ygcx_dynspg_flt(Yi, Yj)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_gcx_dynspg_flt, "gcx_dynspg_flt");
 
 }
@@ -15984 +16546 @@
          Yting[2]=YS1_gcx2( Yi, Yj+1, YTemps);
          Yspguv_dynspg_flt(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_spguv_dynspg_flt, "spguv_dynspg_flt");
 
 }
@@ -15994 +16557 @@
          Yting[2]=YS1_ua_c( Yi, Yj, Yk);
          Yua(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_ua, "ua");
          Yting[0]=YS1_va_1_dynspg_flt( Yi, Yj, Yk, YTemps);
          Yting[1]=YS2_spguv_dynspg_flt( Yi, Yj, YTemps);
          Yting[2]=YS1_va_c( Yi, Yj, Yk);
          Yva(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2] );
+         Ydbg_nanf ("F: ", YNBI_va, "va");
 
 }
@@ -16008 +16573 @@
          Yting[3]=YS1_sshn_c( Yi, Yj);
          Ysshn(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_sshn, "sshn");
          Yting[0]=YS1_sshb( Yi, Yj, YTemps-1);
          Yting[1]=YS1_sshn( Yi, Yj, YTemps-1);
@@ -16013 +16579 @@
          Yting[3]=YS1_sshn_c( Yi, Yj);
          Ysshb(Yi, Yj)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_sshb, "sshb");
 
 }
@@ -16024 +16591 @@
          Yting[3]=YS1_ua_c( Yi, Yj, Yk);
          Yub(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_ub, "ub");
          Yting[0]=YS1_vb( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_va( Yi, Yj, Yk, YTemps-1);
@@ -16029 +16597 @@
          Yting[3]=YS1_va_c( Yi, Yj, Yk);
          Yvb(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_vb, "vb");
 
 }
@@ -16046 +16615 @@
          Yting[3]=YS1_va( Yi, Yj-1, Yk, YTemps);
          Yhdivn(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_hdivn, "hdivn");
          if (1==0 || Yi+1>YA1_S3dt-1)
          Yting[0]=0; 
@@ -16057 +16627 @@
          Yting[3]=YS1_ua( Yi, Yj, Yk, YTemps);
          Yrotn(Yi, Yj, Yk)->forward( Yting[0], Yting[1], Yting[2], Yting[3] );
+         Ydbg_nanf ("F: ", YNBI_rotn, "rotn");
 
 }
@@ -16069 +16640 @@
          Yting[1]=YS1_hdivn( Yi, Yj, Yk, YTemps);
          Ywa(Yi, Yj, Yk)->forward( Yting[0], Yting[1] );
+         Ydbg_nanf ("F: ", YNBI_wa, "wa");
 
 }
@@ -16090 +16662 @@
          {      memcpy(&YD1Y_sbcgyre_qsr_qns, &YG1Y_sbcgyre_qsr_qns, YNBS_sbcgyre_qsr_qns*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sbcgyre_qsr_qns, "sbcgyre_qsr_qns");
          Ysbcgyre_emp1(Yi, Yj)->backward();
          if (1==0 || Yi-1<0)
@@ -16131 +16704 @@
          {      memcpy(&YD1Y_sbcgyre_zsumemp_zsurf, &YG1Y_sbcgyre_zsumemp_zsurf, YNBS_sbcgyre_zsumemp_zsurf*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sbcgyre_zsumemp_zsurf, "sbcgyre_zsumemp_zsurf");
 
 }
@@ -16148 +16722 @@
          {      memcpy(&YD1Y_sbcgyre_emp, &YG1Y_sbcgyre_emp, YNBS_sbcgyre_emp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sbcgyre_emp, "sbcgyre_emp");
          Yting[0]=YS1_sbcgyre_emp( Yi, Yj, YTemps);
          Ytbeta[0]=YG1_sbcgyre_emp( Yi, Yj, YTemps);
@@ -16156 +16731 @@
          {      memcpy(&YD1Y_sbcgyre_emps, &YG1Y_sbcgyre_emps, YNBS_sbcgyre_emps*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sbcgyre_emps, "sbcgyre_emps");
          Ysbcgyre_utau_vtau(Yi, Yj)->backward();
          if (1==0 || Yi-1<0)
@@ -16183 +16759 @@
          {      memcpy(&YD1Y_sbcgyre_wndm, &YG1Y_sbcgyre_wndm, YNBS_sbcgyre_wndm*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sbcgyre_wndm, "sbcgyre_wndm");
 
 }
@@ -16215 +16792 @@
          {      memcpy(&YD1Y_bn2_rn2, &YG1Y_bn2_rn2, YNBS_bn2_rn2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_bn2_rn2, "bn2_rn2");
 
 }
@@ -16349 +16927 @@
          {      memcpy(&YD1Y_zdf_avt_avmu_avmv, &YG1Y_zdf_avt_avmu_avmv, YNBS_zdf_avt_avmu_avmv*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zdf_avt_avmu_avmv, "zdf_avt_avmu_avmv");
 
 }
@@ -16422 +17001 @@
          {      memcpy(&YD1Y_zdfmxl_hmld, &YG1Y_zdfmxl_hmld, YNBS_zdfmxl_hmld*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zdfmxl_hmld, "zdfmxl_hmld");
          Yting[0]=YS1_rhop( Yi, Yj, 0, YTemps-1);
          Yting[1]=YS1_rhop( Yi, Yj, 1, YTemps-1);
@@ -16490 +17070 @@
          {      memcpy(&YD1Y_zdfmxl_nmln_hmlp_hmlpt, &YG1Y_zdfmxl_nmln_hmlp_hmlpt, YNBS_zdfmxl_nmln_hmlp_hmlpt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zdfmxl_nmln_hmlp_hmlpt, "zdfmxl_nmln_hmlp_hmlpt");
 
 }
@@ -16507 +17088 @@
          {      memcpy(&YD1Y_ta_sa_trasbc, &YG1Y_ta_sa_trasbc, YNBS_ta_sa_trasbc*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_sa_trasbc, "ta_sa_trasbc");
 
 }
@@ -16523 +17105 @@
          {      memcpy(&YD1Y_ta_traqsr, &YG1Y_ta_traqsr, YNBS_ta_traqsr*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_traqsr, "ta_traqsr");
 
 }
@@ -16558 +17141 @@
          {      memcpy(&YD1Y_zcent_hor_traadv_cen2, &YG1Y_zcent_hor_traadv_cen2, YNBS_zcent_hor_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zcent_hor_traadv_cen2, "zcent_hor_traadv_cen2");
          Yting[0]=YS1_ua( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_va( Yi, Yj, Yk, YTemps-1);
@@ -16586 +17170 @@
          {      memcpy(&YD1Y_zcens_hor_traadv_cen2, &YG1Y_zcens_hor_traadv_cen2, YNBS_zcens_hor_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zcens_hor_traadv_cen2, "zcens_hor_traadv_cen2");
 
 }
@@ -16619 +17204 @@
          {      memcpy(&YD1Y_ta_hor_traadv_cen2, &YG1Y_ta_hor_traadv_cen2, YNBS_ta_hor_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_hor_traadv_cen2, "ta_hor_traadv_cen2");
          Yting[0]=YS2_ta_sa_trasbc( Yi, Yj, YTemps);
          if (1==0 || Yi-1<0)
@@ -16647 +17233 @@
          {      memcpy(&YD1Y_sa_hor_traadv_cen2, &YG1Y_sa_hor_traadv_cen2, YNBS_sa_hor_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sa_hor_traadv_cen2, "sa_hor_traadv_cen2");
 
 }
@@ -16673 +17260 @@
          {      memcpy(&YD1Y_zcent_ver_traadv_cen2, &YG1Y_zcent_ver_traadv_cen2, YNBS_zcent_ver_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zcent_ver_traadv_cen2, "zcent_ver_traadv_cen2");
          Yting[0]=YS1_wa( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_sa( Yi, Yj, Yk, YTemps-1);
@@ -16691 +17279 @@
          {      memcpy(&YD1Y_zcens_ver_traadv_cen2, &YG1Y_zcens_ver_traadv_cen2, YNBS_zcens_ver_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zcens_ver_traadv_cen2, "zcens_ver_traadv_cen2");
 
 }
@@ -16715 +17304 @@
          {      memcpy(&YD1Y_ta_ver_traadv_cen2, &YG1Y_ta_ver_traadv_cen2, YNBS_ta_ver_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_ver_traadv_cen2, "ta_ver_traadv_cen2");
          Yting[0]=YS1_sa_hor_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zcens_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
@@ -16733 +17323 @@
          {      memcpy(&YD1Y_sa_ver_traadv_cen2, &YG1Y_sa_ver_traadv_cen2, YNBS_sa_ver_traadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sa_ver_traadv_cen2, "sa_ver_traadv_cen2");
 
 }
@@ -16763 +17354 @@
          {      memcpy(&YD1Y_ztuv_traldf_lap, &YG1Y_ztuv_traldf_lap, YNBS_ztuv_traldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ztuv_traldf_lap, "ztuv_traldf_lap");
          Yting[0]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          if (1==0 || Yi+1>YA1_S3dt-1)
@@ -16787 +17379 @@
          {      memcpy(&YD1Y_zsuv_traldf_lap, &YG1Y_zsuv_traldf_lap, YNBS_zsuv_traldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zsuv_traldf_lap, "zsuv_traldf_lap");
          Yting[0]=YS1_ta_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ztuv_traldf_lap( Yi, Yj, Yk, YTemps);
@@ -16815 +17408 @@
          {      memcpy(&YD1Y_ta_traldf_lap, &YG1Y_ta_traldf_lap, YNBS_ta_traldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_traldf_lap, "ta_traldf_lap");
          Yting[0]=YS1_sa_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zsuv_traldf_lap( Yi, Yj, Yk, YTemps);
@@ -16843 +17437 @@
          {      memcpy(&YD1Y_sa_traldf_lap, &YG1Y_sa_traldf_lap, YNBS_sa_traldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sa_traldf_lap, "sa_traldf_lap");
 
 }
@@ -16865 +17460 @@
          {      memcpy(&YD1Y_zwisd_trazdf_imp, &YG1Y_zwisd_trazdf_imp, YNBS_zwisd_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwisd_trazdf_imp, "zwisd_trazdf_imp");
          Yting[0]=YS1_ta_traldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_tb( Yi, Yj, Yk, YTemps-1);
@@ -16875 +17471 @@
          {      memcpy(&YD1Y_zrhs_trazdf_imp, &YG1Y_zrhs_trazdf_imp, YNBS_zrhs_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zrhs_trazdf_imp, "zrhs_trazdf_imp");
          Yting[0]=YS1_sa_traldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_sb( Yi, Yj, Yk, YTemps-1);
@@ -16885 +17482 @@
          {      memcpy(&YD1Y_zrhs_sa_trazdf_imp, &YG1Y_zrhs_sa_trazdf_imp, YNBS_zrhs_sa_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zrhs_sa_trazdf_imp, "zrhs_sa_trazdf_imp");
 
 }
@@ -16917 +17515 @@
          {      memcpy(&YD1Y_zwt_trazdf_imp, &YG1Y_zwt_trazdf_imp, YNBS_zwt_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwt_trazdf_imp, "zwt_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -16943 +17542 @@
          {      memcpy(&YD1Y_ta_de_trazdf_imp, &YG1Y_ta_de_trazdf_imp, YNBS_ta_de_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta_de_trazdf_imp, "ta_de_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -16969 +17569 @@
          {      memcpy(&YD1Y_sa_de_trazdf_imp, &YG1Y_sa_de_trazdf_imp, YNBS_sa_de_trazdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sa_de_trazdf_imp, "sa_de_trazdf_imp");
 
 }
@@ -16997 +17598 @@
          {      memcpy(&YD1Y_ta, &YG1Y_ta, YNBS_ta*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ta, "ta");
          Yting[0]=YS2_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -17019 +17621 @@
          {      memcpy(&YD1Y_sa, &YG1Y_sa, YNBS_sa*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sa, "sa");
 
 }
@@ -17039 +17642 @@
          {      memcpy(&YD1Y_tb, &YG1Y_tb, YNBS_tb*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_tb, "tb");
          Yting[0]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_sa( Yi, Yj, Yk, YTemps-1);
@@ -17053 +17657 @@
          {      memcpy(&YD1Y_sb, &YG1Y_sb, YNBS_sb*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sb, "sb");
 
 }
@@ -17069 +17674 @@
          {      memcpy(&YD1Y_rhd, &YG1Y_rhd, YNBS_rhd*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_rhd, "rhd");
          Yting[0]=YS1_rhd( Yi, Yj, Yk, YTemps);
          Ytbeta[0]=YG1_rhd( Yi, Yj, Yk, YTemps);
@@ -17077 +17683 @@
          {      memcpy(&YD1Y_rhop, &YG1Y_rhop, YNBS_rhop*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_rhop, "rhop");
 
 }
@@ -17126 +17733 @@
          {      memcpy(&YD1Y_hmf_TF_dynadv_cen2, &YG1Y_hmf_TF_dynadv_cen2, YNBS_hmf_TF_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_hmf_TF_dynadv_cen2, "hmf_TF_dynadv_cen2");
 
 }
@@ -17157 +17765 @@
          {      memcpy(&YD1Y_zua_dhmf_dynadv_cen2, &YG1Y_zua_dhmf_dynadv_cen2, YNBS_zua_dhmf_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zua_dhmf_dynadv_cen2, "zua_dhmf_dynadv_cen2");
          Yting[0]=YS3_hmf_TF_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -17183 +17792 @@
          {      memcpy(&YD1Y_zva_dhmf_dynadv_cen2, &YG1Y_zva_dhmf_dynadv_cen2, YNBS_zva_dhmf_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zva_dhmf_dynadv_cen2, "zva_dhmf_dynadv_cen2");
 
 }
@@ -17235 +17845 @@
          {      memcpy(&YD1Y_zfuv_UW_dynadv_cen2, &YG1Y_zfuv_UW_dynadv_cen2, YNBS_zfuv_UW_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zfuv_UW_dynadv_cen2, "zfuv_UW_dynadv_cen2");
 
 }
@@ -17259 +17870 @@
          {      memcpy(&YD1Y_ua_dynadv_cen2, &YG1Y_ua_dynadv_cen2, YNBS_ua_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_dynadv_cen2, "ua_dynadv_cen2");
          Yting[0]=YS2_zfuv_UW_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -17277 +17889 @@
          {      memcpy(&YD1Y_va_dynadv_cen2, &YG1Y_va_dynadv_cen2, YNBS_va_dynadv_cen2*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_dynadv_cen2, "va_dynadv_cen2");
 
 }
@@ -17310 +17923 @@
          {      memcpy(&YD1Y_zwxyz_vor_ene, &YG1Y_zwxyz_vor_ene, YNBS_zwxyz_vor_ene*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwxyz_vor_ene, "zwxyz_vor_ene");
 
 }
@@ -17359 +17973 @@
          {      memcpy(&YD1Y_ua_vor_ene, &YG1Y_ua_vor_ene, YNBS_ua_vor_ene*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_vor_ene, "ua_vor_ene");
          Yting[0]=YS1_va_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -17403 +18018 @@
          {      memcpy(&YD1Y_va_vor_ene, &YG1Y_va_vor_ene, YNBS_va_vor_ene*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_vor_ene, "va_vor_ene");
          Yting[0]=YS1_ua_vor_ene( Yi, Yj, Yk, YTemps);
          if (1==0 || Yj-1<0)
@@ -17431 +18047 @@
          {      memcpy(&YD1Y_ua_dyn_ldf_lap, &YG1Y_ua_dyn_ldf_lap, YNBS_ua_dyn_ldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_dyn_ldf_lap, "ua_dyn_ldf_lap");
          Yting[0]=YS1_va_vor_ene( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -17459 +18076 @@
          {      memcpy(&YD1Y_va_dyn_ldf_lap, &YG1Y_va_dyn_ldf_lap, YNBS_va_dyn_ldf_lap*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_dyn_ldf_lap, "va_dyn_ldf_lap");
 
 }
@@ -17531 +18149 @@
          {      memcpy(&YD1Y_zhpij_dyn_hpg_zco, &YG1Y_zhpij_dyn_hpg_zco, YNBS_zhpij_dyn_hpg_zco*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zhpij_dyn_hpg_zco, "zhpij_dyn_hpg_zco");
          Yting[0]=YS1_ua_dyn_ldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zhpij_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
@@ -17541 +18160 @@
          {      memcpy(&YD1Y_ua_dyn_hpg_zco, &YG1Y_ua_dyn_hpg_zco, YNBS_ua_dyn_hpg_zco*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_dyn_hpg_zco, "ua_dyn_hpg_zco");
          Yting[0]=YS1_va_dyn_ldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS2_zhpij_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
@@ -17551 +18171 @@
          {      memcpy(&YD1Y_va_dyn_hpg_zco, &YG1Y_va_dyn_hpg_zco, YNBS_va_dyn_hpg_zco*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_dyn_hpg_zco, "va_dyn_hpg_zco");
 
 }
@@ -17573 +18194 @@
          {      memcpy(&YD1Y_zwisd_ua_dynzdf_imp, &YG1Y_zwisd_ua_dynzdf_imp, YNBS_zwisd_ua_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwisd_ua_dynzdf_imp, "zwisd_ua_dynzdf_imp");
          Yting[0]=YS3_zdf_avt_avmu_avmv( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -17589 +18211 @@
          {      memcpy(&YD1Y_zwisd_va_dynzdf_imp, &YG1Y_zwisd_va_dynzdf_imp, YNBS_zwisd_va_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwisd_va_dynzdf_imp, "zwisd_va_dynzdf_imp");
          Yting[0]=YS1_ua_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
@@ -17601 +18224 @@
          {      memcpy(&YD1Y_zrhs_ua_dynzdf_imp, &YG1Y_zrhs_ua_dynzdf_imp, YNBS_zrhs_ua_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zrhs_ua_dynzdf_imp, "zrhs_ua_dynzdf_imp");
          Yting[0]=YS1_va_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
@@ -17613 +18237 @@
          {      memcpy(&YD1Y_zrhs_va_dynzdf_imp, &YG1Y_zrhs_va_dynzdf_imp, YNBS_zrhs_va_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zrhs_va_dynzdf_imp, "zrhs_va_dynzdf_imp");
 
 }
@@ -17645 +18270 @@
          {      memcpy(&YD1Y_zwt_ua_dynzdf_imp, &YG1Y_zwt_ua_dynzdf_imp, YNBS_zwt_ua_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwt_ua_dynzdf_imp, "zwt_ua_dynzdf_imp");
          Yting[0]=YS1_zwisd_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -17671 +18297 @@
          {      memcpy(&YD1Y_ua_de_dynzdf_imp, &YG1Y_ua_de_dynzdf_imp, YNBS_ua_de_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_de_dynzdf_imp, "ua_de_dynzdf_imp");
          Yting[0]=YS1_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -17697 +18324 @@
          {      memcpy(&YD1Y_zwt_va_dynzdf_imp, &YG1Y_zwt_va_dynzdf_imp, YNBS_zwt_va_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_zwt_va_dynzdf_imp, "zwt_va_dynzdf_imp");
          Yting[0]=YS1_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -17723 +18351 @@
          {      memcpy(&YD1Y_va_de_dynzdf_imp, &YG1Y_va_de_dynzdf_imp, YNBS_va_de_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_de_dynzdf_imp, "va_de_dynzdf_imp");
 
 }
@@ -17749 +18378 @@
          {      memcpy(&YD1Y_ua_dynzdf_imp, &YG1Y_ua_dynzdf_imp, YNBS_ua_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_dynzdf_imp, "ua_dynzdf_imp");
          Yting[0]=YS2_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -17769 +18399 @@
          {      memcpy(&YD1Y_va_dynzdf_imp, &YG1Y_va_dynzdf_imp, YNBS_va_dynzdf_imp*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_dynzdf_imp, "va_dynzdf_imp");
 
 }
@@ -17785 +18416 @@
          {      memcpy(&YD1Y_ua_norm_dynzdf, &YG1Y_ua_norm_dynzdf, YNBS_ua_norm_dynzdf*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_norm_dynzdf, "ua_norm_dynzdf");
          Yting[0]=YS1_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
@@ -17795 +18427 @@
          {      memcpy(&YD1Y_va_norm_dynzdf, &YG1Y_va_norm_dynzdf, YNBS_va_norm_dynzdf*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_norm_dynzdf, "va_norm_dynzdf");
 
 }
@@ -17824 +18457 @@
          {      memcpy(&YD1Y_spguv_now_dynspg, &YG1Y_spguv_now_dynspg, YNBS_spguv_now_dynspg*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_spguv_now_dynspg, "spguv_now_dynspg");
 
 }
@@ -17842 +18476 @@
          {      memcpy(&YD1Y_ua_1_dynspg_flt, &YG1Y_ua_1_dynspg_flt, YNBS_ua_1_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua_1_dynspg_flt, "ua_1_dynspg_flt");
          Yting[0]=YS1_va_norm_dynzdf( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_vb( Yi, Yj, Yk, YTemps-1);
@@ -17854 +18489 @@
          {      memcpy(&YD1Y_va_1_dynspg_flt, &YG1Y_va_1_dynspg_flt, YNBS_va_1_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va_1_dynspg_flt, "va_1_dynspg_flt");
 
 }
@@ -17927 +18563 @@
          {      memcpy(&YD1Y_sum_spgu_dynspg_flt, &YG1Y_sum_spgu_dynspg_flt, YNBS_sum_spgu_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sum_spgu_dynspg_flt, "sum_spgu_dynspg_flt");
          Yting[0]=YS1_va_1_dynspg_flt( Yi, Yj, 0, YTemps);
          Yting[1]=YS1_va_1_dynspg_flt( Yi, Yj, 1, YTemps);
@@ -17995 +18632 @@
          {      memcpy(&YD1Y_sum_spgv_dynspg_flt, &YG1Y_sum_spgv_dynspg_flt, YNBS_sum_spgv_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sum_spgv_dynspg_flt, "sum_spgv_dynspg_flt");
 
 }
@@ -18026 +18664 @@
          {      memcpy(&YD1Y_gcb_dynspg_flt, &YG1Y_gcb_dynspg_flt, YNBS_gcb_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_gcb_dynspg_flt, "gcb_dynspg_flt");
          Yting[0]=YS1_gcx2( Yi, Yj, YTemps-1);
          Yting[1]=YS1_gcx2( Yi, Yj, YTemps-2);
@@ -18036 +18675 @@
          {      memcpy(&YD1Y_gcx_dynspg_flt, &YG1Y_gcx_dynspg_flt, YNBS_gcx_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_gcx_dynspg_flt, "gcx_dynspg_flt");
 
 }
@@ -18076 +18716 @@
          {      memcpy(&YD1Y_spguv_dynspg_flt, &YG1Y_spguv_dynspg_flt, YNBS_spguv_dynspg_flt*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_spguv_dynspg_flt, "spguv_dynspg_flt");
 
 }
@@ -18094 +18735 @@
          {      memcpy(&YD1Y_ua, &YG1Y_ua, YNBS_ua*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ua, "ua");
          Yting[0]=YS1_va_1_dynspg_flt( Yi, Yj, Yk, YTemps);
          Yting[1]=YS2_spguv_dynspg_flt( Yi, Yj, YTemps);
@@ -18106 +18748 @@
          {      memcpy(&YD1Y_va, &YG1Y_va, YNBS_va*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_va, "va");
 
 }
@@ -18125 +18768 @@
          {      memcpy(&YD1Y_sshn, &YG1Y_sshn, YNBS_sshn*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sshn, "sshn");
          Yting[0]=YS1_sshb( Yi, Yj, YTemps-1);
          Yting[1]=YS1_sshn( Yi, Yj, YTemps-1);
@@ -18139 +18783 @@
          {      memcpy(&YD1Y_sshb, &YG1Y_sshb, YNBS_sshb*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_sshb, "sshb");
 
 }
@@ -18159 +18804 @@
          {      memcpy(&YD1Y_ub, &YG1Y_ub, YNBS_ub*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_ub, "ub");
          Yting[0]=YS1_vb( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_va( Yi, Yj, Yk, YTemps-1);
@@ -18173 +18819 @@
          {      memcpy(&YD1Y_vb, &YG1Y_vb, YNBS_vb*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_vb, "vb");
 
 }
@@ -18205 +18852 @@
          {      memcpy(&YD1Y_hdivn, &YG1Y_hdivn, YNBS_hdivn*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_hdivn, "hdivn");
          if (1==0 || Yi+1>YA1_S3dt-1)
          Yting[0]=0; 
@@ -18231 +18879 @@
          {      memcpy(&YD1Y_rotn, &YG1Y_rotn, YNBS_rotn*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_rotn, "rotn");
 
 }
@@ -18253 +18902 @@
          {      memcpy(&YD1Y_wa, &YG1Y_wa, YNBS_wa*sizeof(YREAL));
          }
+         Ydbg_nanf ("L: ", YNBI_wa, "wa");
 
 }
@@ -21055 +21705 @@
                         if (!Ytesterrad_mod("wa", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_wa, "wa");
 
 }
@@ -21097 +21748 @@
                         if (!Ytesterrad_mod("rotn", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_rotn, "rotn");
          Yting[0]=YS1_ua( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -21133 +21785 @@
                         if (!Ytesterrad_mod("hdivn", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_hdivn, "hdivn");
 
 }
@@ -21160 +21813 @@
                         if (!Ytesterrad_mod("vb", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_vb, "vb");
          Yting[0]=YS1_ub( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_ua( Yi, Yj, Yk, YTemps-1);
@@ -21181 +21835 @@
                         if (!Ytesterrad_mod("ub", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ub, "ub");
 
 }
@@ -21207 +21862 @@
                         if (!Ytesterrad_mod("sshb", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sshb, "sshb");
          Yting[0]=YS1_sshb( Yi, Yj, YTemps-1);
          Yting[1]=YS1_wa( Yi, Yj, 0, YTemps-1);
@@ -21228 +21884 @@
                         if (!Ytesterrad_mod("sshn", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sshn, "sshn");
 
 }
@@ -21252 +21909 @@
                         if (!Ytesterrad_mod("va", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va, "va");
          Yting[0]=YS1_ua_1_dynspg_flt( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_spguv_dynspg_flt( Yi, Yj, YTemps);
@@ -21270 +21928 @@
                         if (!Ytesterrad_mod("ua", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua, "ua");
 
 }
@@ -21308 +21967 @@
                         if (!Ytesterrad_mod("spguv_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_spguv_dynspg_flt, "spguv_dynspg_flt");
 
 }
@@ -21338 +21998 @@
                         if (!Ytesterrad_mod("gcx_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_gcx_dynspg_flt, "gcx_dynspg_flt");
          Yting[0]=YS1_sum_spgu_dynspg_flt( Yi, Yj, YTemps);
          if (1==0 || Yi-1<0)
@@ -21374 +22035 @@
                         if (!Ytesterrad_mod("gcb_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_gcb_dynspg_flt, "gcb_dynspg_flt");
 
 }
@@ -21480 +22142 @@
                         if (!Ytesterrad_mod("sum_spgv_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sum_spgv_dynspg_flt, "sum_spgv_dynspg_flt");
          Yting[0]=YS1_ua_1_dynspg_flt( Yi, Yj, 0, YTemps);
          Yting[1]=YS1_ua_1_dynspg_flt( Yi, Yj, 1, YTemps);
@@ -21581 +22244 @@
                         if (!Ytesterrad_mod("sum_spgu_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sum_spgu_dynspg_flt, "sum_spgu_dynspg_flt");
 
 }
@@ -21604 +22268 @@
                         if (!Ytesterrad_mod("va_1_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_1_dynspg_flt, "va_1_dynspg_flt");
          Yting[0]=YS1_ua_norm_dynzdf( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
@@ -21621 +22286 @@
                         if (!Ytesterrad_mod("ua_1_dynspg_flt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_1_dynspg_flt, "ua_1_dynspg_flt");
 
 }
@@ -21659 +22325 @@
                         if (!Ytesterrad_mod("spguv_now_dynspg", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_spguv_now_dynspg, "spguv_now_dynspg");
 
 }
@@ -21679 +22346 @@
                         if (!Ytesterrad_mod("va_norm_dynzdf", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_norm_dynzdf, "va_norm_dynzdf");
          Yting[0]=YS1_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
@@ -21693 +22361 @@
                         if (!Ytesterrad_mod("ua_norm_dynzdf", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_norm_dynzdf, "ua_norm_dynzdf");
 
 }
@@ -21727 +22396 @@
                         if (!Ytesterrad_mod("va_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_dynzdf_imp, "va_dynzdf_imp");
          Yting[0]=YS2_zwisd_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -21755 +22425 @@
                         if (!Ytesterrad_mod("ua_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_dynzdf_imp, "ua_dynzdf_imp");
 
 }
@@ -21797 +22468 @@
                         if (!Ytesterrad_mod("va_de_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_de_dynzdf_imp, "va_de_dynzdf_imp");
          Yting[0]=YS1_zwisd_va_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -21833 +22505 @@
                         if (!Ytesterrad_mod("zwt_va_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwt_va_dynzdf_imp, "zwt_va_dynzdf_imp");
          Yting[0]=YS1_zwisd_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -21869 +22542 @@
                         if (!Ytesterrad_mod("ua_de_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_de_dynzdf_imp, "ua_de_dynzdf_imp");
          Yting[0]=YS1_zwisd_ua_dynzdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -21905 +22579 @@
                         if (!Ytesterrad_mod("zwt_ua_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwt_ua_dynzdf_imp, "zwt_ua_dynzdf_imp");
 
 }
@@ -21928 +22603 @@
                         if (!Ytesterrad_mod("zrhs_va_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zrhs_va_dynzdf_imp, "zrhs_va_dynzdf_imp");
          Yting[0]=YS1_ua_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ub( Yi, Yj, Yk, YTemps-1);
@@ -21945 +22621 @@
                         if (!Ytesterrad_mod("zrhs_ua_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zrhs_ua_dynzdf_imp, "zrhs_ua_dynzdf_imp");
          Yting[0]=YS3_zdf_avt_avmu_avmv( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -21967 +22644 @@
                         if (!Ytesterrad_mod("zwisd_va_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwisd_va_dynzdf_imp, "zwisd_va_dynzdf_imp");
          Yting[0]=YS2_zdf_avt_avmu_avmv( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -21989 +22667 @@
                         if (!Ytesterrad_mod("zwisd_ua_dynzdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwisd_ua_dynzdf_imp, "zwisd_ua_dynzdf_imp");
 
 }
@@ -22009 +22688 @@
                         if (!Ytesterrad_mod("va_dyn_hpg_zco", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_dyn_hpg_zco, "va_dyn_hpg_zco");
          Yting[0]=YS1_ua_dyn_ldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zhpij_dyn_hpg_zco( Yi, Yj, Yk, YTemps);
@@ -22023 +22703 @@
                         if (!Ytesterrad_mod("ua_dyn_hpg_zco", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_dyn_hpg_zco, "ua_dyn_hpg_zco");
          if (1==0 || Yi+1>YA1_S3dt-1)
          Yting[0]=0; 
@@ -22111 +22792 @@
                         if (!Ytesterrad_mod("zhpij_dyn_hpg_zco", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zhpij_dyn_hpg_zco, "zhpij_dyn_hpg_zco");
 
 }
@@ -22157 +22839 @@
                         if (!Ytesterrad_mod("va_dyn_ldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_dyn_ldf_lap, "va_dyn_ldf_lap");
          Yting[0]=YS1_ua_vor_ene( Yi, Yj, Yk, YTemps);
          if (1==0 || Yj-1<0)
@@ -22196 +22879 @@
                         if (!Ytesterrad_mod("ua_dyn_ldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_dyn_ldf_lap, "ua_dyn_ldf_lap");
          Yting[0]=YS1_va_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -22257 +22941 @@
                         if (!Ytesterrad_mod("va_vor_ene", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_vor_ene, "va_vor_ene");
          Yting[0]=YS1_ua_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yj-1<0)
@@ -22318 +23003 @@
                         if (!Ytesterrad_mod("ua_vor_ene", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_vor_ene, "ua_vor_ene");
 
 }
@@ -22359 +23045 @@
                         if (!Ytesterrad_mod("zwxyz_vor_ene", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwxyz_vor_ene, "zwxyz_vor_ene");
 
 }
@@ -22392 +23079 @@
                         if (!Ytesterrad_mod("va_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_va_dynadv_cen2, "va_dynadv_cen2");
          Yting[0]=YS1_zfuv_UW_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -22417 +23105 @@
                         if (!Ytesterrad_mod("ua_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ua_dynadv_cen2, "ua_dynadv_cen2");
 
 }
@@ -22484 +23173 @@
                         if (!Ytesterrad_mod("zfuv_UW_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zfuv_UW_dynadv_cen2, "zfuv_UW_dynadv_cen2");
 
 }
@@ -22527 +23217 @@
                         if (!Ytesterrad_mod("zva_dhmf_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zva_dhmf_dynadv_cen2, "zva_dhmf_dynadv_cen2");
          Yting[0]=YS1_hmf_TF_dynadv_cen2( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -22563 +23254 @@
                         if (!Ytesterrad_mod("zua_dhmf_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zua_dhmf_dynadv_cen2, "zua_dhmf_dynadv_cen2");
 
 }
@@ -22626 +23318 @@
                         if (!Ytesterrad_mod("hmf_TF_dynadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_hmf_TF_dynadv_cen2, "hmf_TF_dynadv_cen2");
 
 }
@@ -22645 +23338 @@
                         if (!Ytesterrad_mod("rhop", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_rhop, "rhop");
          Yting[0]=YS1_tb( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_sb( Yi, Yj, Yk, YTemps);
@@ -22659 +23353 @@
                         if (!Ytesterrad_mod("rhd", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_rhd, "rhd");
 
 }
@@ -22686 +23381 @@
                         if (!Ytesterrad_mod("sb", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sb, "sb");
          Yting[0]=YS1_tb( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_ta( Yi, Yj, Yk, YTemps-1);
@@ -22707 +23403 @@
                         if (!Ytesterrad_mod("tb", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_tb, "tb");
 
 }
@@ -22745 +23442 @@
                         if (!Ytesterrad_mod("sa", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sa, "sa");
          Yting[0]=YS2_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -22777 +23475 @@
                         if (!Ytesterrad_mod("ta", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta, "ta");
 
 }
@@ -22819 +23518 @@
                         if (!Ytesterrad_mod("sa_de_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sa_de_trazdf_imp, "sa_de_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -22855 +23555 @@
                         if (!Ytesterrad_mod("ta_de_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_de_trazdf_imp, "ta_de_trazdf_imp");
          Yting[0]=YS1_zwisd_trazdf_imp( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk-1<0)
@@ -22891 +23592 @@
                         if (!Ytesterrad_mod("zwt_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwt_trazdf_imp, "zwt_trazdf_imp");
 
 }
@@ -22911 +23613 @@
                         if (!Ytesterrad_mod("zrhs_sa_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zrhs_sa_trazdf_imp, "zrhs_sa_trazdf_imp");
          Yting[0]=YS1_ta_traldf_lap( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_tb( Yi, Yj, Yk, YTemps-1);
@@ -22925 +23628 @@
                         if (!Ytesterrad_mod("zrhs_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zrhs_trazdf_imp, "zrhs_trazdf_imp");
          Yting[0]=YS1_zdf_avt_avmu_avmv( Yi, Yj, Yk, YTemps);
          if (1==0 || Yk+1>YA3_S3dt-1)
@@ -22947 +23651 @@
                         if (!Ytesterrad_mod("zwisd_trazdf_imp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zwisd_trazdf_imp, "zwisd_trazdf_imp");
 
 }
@@ -22992 +23697 @@
                         if (!Ytesterrad_mod("sa_traldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sa_traldf_lap, "sa_traldf_lap");
          Yting[0]=YS1_ta_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_ztuv_traldf_lap( Yi, Yj, Yk, YTemps);
@@ -23031 +23737 @@
                         if (!Ytesterrad_mod("ta_traldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_traldf_lap, "ta_traldf_lap");
          Yting[0]=YS1_sb( Yi, Yj, Yk, YTemps-1);
          if (1==0 || Yi+1>YA1_S3dt-1)
@@ -23064 +23771 @@
                         if (!Ytesterrad_mod("zsuv_traldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zsuv_traldf_lap, "zsuv_traldf_lap");
          Yting[0]=YS1_tb( Yi, Yj, Yk, YTemps-1);
          if (1==0 || Yi+1>YA1_S3dt-1)
@@ -23097 +23805 @@
                         if (!Ytesterrad_mod("ztuv_traldf_lap", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ztuv_traldf_lap, "ztuv_traldf_lap");
 
 }
@@ -23128 +23837 @@
                         if (!Ytesterrad_mod("sa_ver_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sa_ver_traadv_cen2, "sa_ver_traadv_cen2");
          Yting[0]=YS1_ta_hor_traadv_cen2( Yi, Yj, Yk, YTemps);
          Yting[1]=YS1_zcent_ver_traadv_cen2( Yi, Yj, Yk, YTemps);
@@ -23153 +23863 @@
                         if (!Ytesterrad_mod("ta_ver_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_ver_traadv_cen2, "ta_ver_traadv_cen2");
 
 }
@@ -23184 +23895 @@
                         if (!Ytesterrad_mod("zcens_ver_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zcens_ver_traadv_cen2, "zcens_ver_traadv_cen2");
          Yting[0]=YS1_wa( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_ta( Yi, Yj, Yk, YTemps-1);
@@ -23209 +23921 @@
                         if (!Ytesterrad_mod("zcent_ver_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zcent_ver_traadv_cen2, "zcent_ver_traadv_cen2");
 
 }
@@ -23255 +23968 @@
                         if (!Ytesterrad_mod("sa_hor_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sa_hor_traadv_cen2, "sa_hor_traadv_cen2");
          Yting[0]=YS1_ta_traqsr( Yi, Yj, Yk, YTemps);
          if (1==0 || Yi-1<0)
@@ -23294 +24008 @@
                         if (!Ytesterrad_mod("ta_hor_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_hor_traadv_cen2, "ta_hor_traadv_cen2");
 
 }
@@ -23338 +24053 @@
                         if (!Ytesterrad_mod("zcens_hor_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zcens_hor_traadv_cen2, "zcens_hor_traadv_cen2");
          Yting[0]=YS1_ua( Yi, Yj, Yk, YTemps-1);
          Yting[1]=YS1_va( Yi, Yj, Yk, YTemps-1);
@@ -23377 +24093 @@
                         if (!Ytesterrad_mod("zcent_hor_traadv_cen2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zcent_hor_traadv_cen2, "zcent_hor_traadv_cen2");
 
 }
@@ -23399 +24116 @@
                         if (!Ytesterrad_mod("ta_traqsr", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_traqsr, "ta_traqsr");
 
 }
@@ -23421 +24139 @@
                         if (!Ytesterrad_mod("ta_sa_trasbc", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_ta_sa_trasbc, "ta_sa_trasbc");
 
 }
@@ -23527 +24246 @@
                         if (!Ytesterrad_mod("zdfmxl_nmln_hmlp_hmlpt", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zdfmxl_nmln_hmlp_hmlpt, "zdfmxl_nmln_hmlp_hmlpt");
          Yting[0]=YS1_zdf_avt_avmu_avmv( Yi, Yj, 0, YTemps);
          Yting[1]=YS1_zdf_avt_avmu_avmv( Yi, Yj, 1, YTemps);
@@ -23628 +24348 @@
                         if (!Ytesterrad_mod("zdfmxl_hmld", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zdfmxl_hmld, "zdfmxl_hmld");
 
 }
@@ -23811 +24532 @@
                         if (!Ytesterrad_mod("zdf_avt_avmu_avmv", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_zdf_avt_avmu_avmv, "zdf_avt_avmu_avmv");
 
 }
@@ -23853 +24575 @@
                         if (!Ytesterrad_mod("bn2_rn2", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_bn2_rn2, "bn2_rn2");
 
 }
@@ -23894 +24617 @@
                         if (!Ytesterrad_mod("sbcgyre_wndm", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sbcgyre_wndm, "sbcgyre_wndm");
          Ysbcgyre_utau_vtau(Yi, Yj)->backward();
          Yting[0]=YS1_sbcgyre_emp( Yi, Yj, YTemps);
@@ -23906 +24630 @@
                         if (!Ytesterrad_mod("sbcgyre_emps", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sbcgyre_emps, "sbcgyre_emps");
          Yting[0]=YS1_sbcgyre_emp1( Yi, Yj, YTemps);
          Yting[1]=YS1_sbcgyre_zsumemp_zsurf( 31, 21, YTemps);
@@ -23923 +24648 @@
                         if (!Ytesterrad_mod("sbcgyre_emp", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sbcgyre_emp, "sbcgyre_emp");
 
 }
@@ -23983 +24709 @@
                         if (!Ytesterrad_mod("sbcgyre_zsumemp_zsurf", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sbcgyre_zsumemp_zsurf, "sbcgyre_zsumemp_zsurf");
          Ysbcgyre_emp1(Yi, Yj)->backward();
          Yting[0]=YS1_tb( Yi, Yj, 0, YTemps-1);
@@ -23995 +24722 @@
                         if (!Ytesterrad_mod("sbcgyre_qsr_qns", YLTRes,YAdRes)) return(0);
          }
+         Ydbg_nanf ("B: ", YNBI_sbcgyre_qsr_qns, "sbcgyre_qsr_qns");
 
 }
@@ -24094 +24822 @@
          else if (strcmp(argv[0], "xrst_save") == 0)
                  xrst_save(argc, argv);
+         else if (strcmp(argv[0], "xchangesavemode") == 0)
+                 xchangesavemode(argc, argv);
          else codret=0;
          return(codret);

trunk/src/Yworkdir/Ysinobad.cpp

@@ -561 +561 @@
 #include "Y2sinobad.h" 
 #define PRJNAME  "sinobad" 
-#define VERREF   "YaoI V.9 01.11.2008 (release 01.11.2008)  " 
+#define VERREF   "YaoI V.9 01.11.2008 (release 01.11.2008)  -O3 " 
 
 //=============================================================================

trunk/src/cost.dat

@@ -1 +1 @@
  0.0000000000000000e+00
+ 0.0000000000000000e+00
+ 0.0000000000000000e+00
+ 2.9733593674719423e+03

trunk/src/sbcgyre_utau_vtau.h

@@ -39 +39 @@
   
     //JUL A MODIFIER APRES TEST
-    YS1= 2;
-    YS2=0;
+    //    YS1= 2;
+    //YS2=0;
     //FIN MODIF JUL
   }

trunk/src/sinobad.d

@@ -21 +21 @@
 #option O_VARINCR
 option    O_GRADTEST
-#option   O_DBG_NANF
+option   O_DBG_NANF
 #option   O_DBG_TING
 option  O_EXTOBJ "../object/ncutil.o"
@@ -45 +45 @@
 #modul   pca_ta                 space   S0d     noward                            output NPCA   target
 
-modul    sshn_c                 space   S3d inter YA1 YA2       noward            output 1      |target
+modul    sshn_c                 space   S3d inter YA1 YA2       noward            output 1      target
 
 modul    ta_c                   space   S3d                     noward            output 1      target
@@ -51 +51 @@
 #modul   ta_c                   space   S3d     input array NPCA                  output 1      
 
-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
+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
 
 #-------------
@@ -126 +126 @@
 #tracer next : filtre asselin
 modul    tb                     space   S3dt                    input 4           output 1      tempo cout
-modul    sb                     space   S3dt                    input 4           output 1      tempo
-##END_tra_nxt
+modul    sb                     space   S3dt                    input 4           output 1      tempo cout
+##END_tra_nxt 
 
 ##START_eos
@@ -196 +196 @@
 modul   va                      space   S3dt                    input 3           output 1      tempo
 modul   sshn                    space   S3dt inter YA1  YA2     input 4           output 1      tempo   
-modul   sshb                    space   S3dt inter YA1  YA2     input 4           output 1      tempo |cout
+modul   sshb                    space   S3dt inter YA1  YA2     input 4           output 1      tempo  cout
 ##END_dyn_spg
 
 ##START_dyn_nxt
 #nxt : filtre d'asselin
-modul    ub                     space   S3dt                    input 4           output 1      tempo 
-modul    vb                     space   S3dt                    input 4           output 1      tempo 
+modul    ub                     space   S3dt                    input 4           output 1      tempo cout
+modul    vb                     space   S3dt                    input 4           output 1      tempo cout
 ##END_dyn_nxt
 

trunk/src/sinobad.h

@@ -188 +188 @@
                         // =YIO_OUTOOBS    => appel via outoobs
 
-   if(indic==YIO_SAVESTATE && !strcmp(nmmod,"tb") && 0){
+   if(indic==YIO_SAVESTATE && !strcmp(nmmod,"tb") && savemode){
     if(kaxe==0 )
       return(1);

trunk/src/ua_de_dynzdf_imp.h

@@ -13 +13 @@
         4       from    zwt_ua_dynzdf_imp       1  i    j    k-1  t*/
 
+  //  if (Yi==30 && Yj==1 && Yt==16)
+  //{
+      printf("Yi=%i,Yj=%i,Yk=%i,Yt=%i,,x1=%f,x2=%f,x3=%f,x4=%f\n",Yk,x1,x2,x3,x4);
+      //}
   /* YS1 */
   /*     ?