Changeset 48 for trunk/src

Timestamp:

05/10/11 16:17:50 (13 years ago)

Author:

jbrlod

Message:

forward solsor ok

Location:

trunk/src

Files:

• sinobad (modified) (previous)
• solsor_flag.h (modified) (2 diffs)

trunk/src/solsor_flag.h

@@ -19 +19 @@
   
   //jn (current iteration) = Yk
-  
-  if ( ((Yk<=nmin) | (Yt==TU)) | ((Yk-nmin)%nmod != 0))
+ 
+  if ( (Yk<=nmin) | (Yt==TU))
     {
       YS1=0;
@@ -26 +26 @@
     }
   else {
-        if (x2 == 1) {
+    if (x2 == 1) {
       YS1=0; //plus besoin d'avoir la valeur du max
       YS2=1;
     }
     else {
-      
-      if ( (Yi==0) & (Yj==0) ) { 
-        YS1=x1;
+      if ((Yk-nmin)%nmod != 0) {
+        YS1=0;
+        YS2=0;
       }
       else {
-        if (Yj==0) YS1= ((x3<x1) ? x1 : x3) ; //max(x1,x3)
-        else YS1 = ((x4<x1) ? x1 : x4) ; // max(x1,x4)
-        if ( ( (Yi==NX-1) & (Yj ==NY-1) ) & (YS1< resmax)) 
-          {
-YS2=1;
-printf("FOR=======tniter(%d)=%d\n",Yt,Yk);
-} //moment de tester le maximum       
-        else YS2=0;     
-      } // Yi>0 || Yj>0
-    }  //x2==0
-        // printf("%d\t%d\t%d\t%e\t%e\t%e\t%e\t\n",Yk,Yj,Yi,x1,x2,x3,x4); 
-        //      if (Yt==TU+2) printf("%d\t%d\t%d\t%e\t%d\n",Yk,Yj,Yi,YS1,(int)YS2); 
-
-} //Yk>kmin
+        if ( (Yi==0) & (Yj==0) ) { 
+          YS1=x1;
+        }
+        else {
+          if (Yj==0) YS1= ((x3<x1) ? x1 : x3) ; //max(x1,x3)
+          else YS1 = ((x4<x1) ? x1 : x4) ; // max(x1,x4)
+          if ( ( (Yi==NX-1) & (Yj ==NY-1) ) & (YS1< resmax)) 
+            {
+              YS2=1;
+              printf("FOR=======tniter(%d)=%d\n",Yt,Yk);
+            } //moment de tester le maximum       
+          else YS2=0;
+          
+        } // Yi>0 || Yj>0
+      } //((Yk-nmin)%nmod == 0)
+}  //x2==0
+    // printf("%d\t%d\t%d\t%e\t%e\t%e\t%e\t\n",Yk,Yj,Yi,x1,x2,x3,x4); 
+    //  if (Yt==TU+2) printf("%d\t%d\t%d\t%e\t%d\n",Yk,Yj,Yi,YS1,(int)YS2); 
+    
+  } //Yk>kmin
 }
 //===========================================================================