Changeset 45 for trunk/src/solsor_gx2_x_r.h

Timestamp:

05/05/11 11:20:26 (13 years ago)

Author:

jbrlod

Message:

test du solsor jb

File:

• trunk/src/solsor_gx2_x_r.h (modified) (4 diffs)

trunk/src/solsor_gx2_x_r.h

@@ -16 +16 @@
         7       from    solsor_gc1_x_r          1  i    j    k    t
         8       from    solsor_flag             2  NX   NY   k    t
-        9       from    solsor_gc1_x_r          2  i    j    k    t
+        9       from    solsor_gc1_x_r          2  i    j    k-1  t
 } 
 output 1 : gcx
@@ -46 +46 @@
            } //Yk=0;
          else {
-           YREAL gcx,gcr,ztmp,zres;
+           YREAL ztmp,zres;
            int ishift=(Yj-1)%2;
            if ((Yi+1)%2==ishift) { //! Guess black update
              ztmp = x2 
-               - gcp(ji,jj,0,t) * x3   
-               - gcp(ji,jj,1,t) * x4   
-               - gcp(ji,jj,2,t) * x5   
-               - gcp(ji,jj,3,t) * x6;
+               - gcp(Yi,Yj,0,t) * x3   
+               - gcp(Yi,Yj,1,t) * x4   
+               - gcp(Yi,Yj,2,t) * x5   
+               - gcp(Yi,Yj,3,t) * x6;
              //     ! Estimate of the residual
              zres = ztmp - x7;
-             YS2 = zres * gcdmat(ji,jj,t) * zres;
+             YS2 = zres * gcdmat(Yi,Yj,t) * zres;
              //               ! Guess update
              YS1 = sor * ztmp + (1.-sor) * x7;
@@ -66 +66 @@
              }
            
-         }
-         
+                 
          
        } // Yk>0
@@ -77 +76 @@
 //                          methode backward
 
-backward () {
+backward (YREAL x1, YREAL x2, YREAL x3, YREAL x4, YREAL x5, YREAL x6, YREAL x7, YREAL x8, YREAL x9) {
 }