Changeset 60

Timestamp:

07/25/11 15:47:46 (13 years ago)

Author:

berrada

Message:

correction du bug sur le LT avec solsor

Location:

branches/branche-mb/src

Files:

• gcx2.h (modified) (3 diffs)
• sinobad.d (modified) (4 diffs)

branches/branche-mb/src/gcx2.h

@@ -17 +17 @@
   }
   else
-#ifndef K_SOLSORYAO
-     YS1=gcx(Yi,Yj);
+#ifdef K_SOLSORYAO
+   YS1=  x1;
 #else
-               YS1=  x1;
+               YS1=gcx(Yi,Yj);
 #endif
   //
@@ -30 +30 @@
 backward (YREAL x)
 {
+#ifdef K_SOLSORYAO
   if(Yt==TU){
     YJ1I1=0;
@@ -38 +39 @@
     YJ1I1=1;
   //
+#endif
 }
 

branches/branche-mb/src/sinobad.d

@@ -1 @@
-#define FILTER
+//#define FILTER
 //#define SOLSORYAO
 //#define OPTIMORDER
@@ -43 +43 @@
 option    O_M1QN3 | M2QN1 
 //#option O_VARINCR
-//#option    O_GRADTEST
+option    O_GRADTEST
 option   O_DBG_NANF
 //#option   O_DBG_TING
@@ -239 +239 @@
 modul   gcx_dynspg_flt          space   S3dt inter YA1 YA2      input 2           output 1      tempo   
 #ifndef SOLSORYAO
-modul   solsor_dynspg_flt       space   S3dt inter YA1 YA2      input array 19    output 1      tempo
+modul   solsor_dynspg_flt       space   S3dt inter YA1 YA2      input array 19    output 1      tempo hidjac
+modul   gcx2                    space   S3dt inter YA1 YA2      input 1           output 1      tempo hidjac
 #endif
 
@@ -247 +248 @@
 modul   solsor_flag             space   Ssolsor                 input 4           output 2      tempo
 #define S3dt S3dt_b
-#endif
-
-
 modul   gcx2                    space   S3dt inter YA1 YA2      input 1           output 1      tempo   
+#endif
+
+
+
 modul   spguv_dynspg_flt        space   S3dt inter YA1 YA2      input 3           output 2      tempo   
 modul   ua                      space   S3dt                    input 3           output 1      tempo