Changeset 47 for trunk

Timestamp:

05/10/11 12:00:14 (13 years ago)

Author:

jbrlod

Message:

solsor in YAO

Location:

trunk/src

Files:

• Yworkdir/Y2sinobad.h (modified) (2 diffs)
• sinobad (modified) (previous)
• sinobad.d (modified) (2 diffs)
• solsor_flag.h (modified) (2 diffs)
• solsor_gx1_x_r.h (modified) (1 diff)
• solsor_gx2_x_r.h (modified) (1 diff)

trunk/src/Yworkdir/Y2sinobad.h

@@ -6809 +6809 @@
 for(Yi=0; Yi<YA1_S3dt_b; ++Yi)
 {
-         Yting[0]=YS1_solsor_gx2_x_r( Yi, Yj, 30, YTemps);
+         Yting[0]=YS1_solsor_gx2_x_r( Yi, Yj, 799, YTemps);
          Ygcx2(Yi, Yj)->forward( Yting[0] );
 
@@ -7093 +7093 @@
 for(Yi=YA1_S3dt_b-1; Yi>=0; --Yi)
 {
-         Yting[0]=YS1_solsor_gx2_x_r( Yi, Yj, 30, YTemps);
+         Yting[0]=YS1_solsor_gx2_x_r( Yi, Yj, 799, YTemps);
          memset(Yjac, 0, 31*sizeof(double));
          Ygcx2(Yi, Yj)->backward( Yting[0] );
          Yvsmatt (YNBS_gcx2, YNBI_gcx2, YMAX_JAC_NBI, &YG1Y_gcx2, Yjac[0], Ytbeta);
-         YG1_solsor_gx2_x_r( Yi, Yj, 30, YTemps) += Ytbeta[0];
+         YG1_solsor_gx2_x_r( Yi, Yj, 799, YTemps) += Ytbeta[0];
 
 }

trunk/src/sinobad.d

@@ -610 +610 @@
 ctin solsor_gx2_x_r             1       from    gcx_dynspg_flt          1 i    j        t 
 ctin solsor_gx2_x_r             2       from    gcb_dynspg_flt          1 i    j        t
-ctin solsor_gx2_x_r             3       from    solsor_gx1_x_r          1 i    j-1   k  t
+ctin solsor_gx2_x_r             3       from    solsor_gx1_x_r          1 i    j-1   k  t
 ctin solsor_gx2_x_r             4       from    solsor_gx1_x_r          1 i-1  j     k  t
-ctin solsor_gx2_x_r             5       from    solsor_gx1_x_r          1 i+1  j     k  t
+ctin solsor_gx2_x_r             5       from    solsor_gx1_x_r          1 i+1  j     k  t
 ctin solsor_gx2_x_r             6       from    solsor_gx1_x_r          1 i    j+1   k  t
 ctin solsor_gx2_x_r             7       from    solsor_gx1_x_r          1 i    j     k  t
@@ -618 +618 @@
 ctin solsor_gx2_x_r             9       from    solsor_gx1_x_r          2 i    j     k  t
 
-ctin gcx2                       1       from    solsor_gx2_x_r          1 i    j     NZ  t
+ctin gcx2                       1       from    solsor_gx2_x_r          1 i    j     NMAX  t
 #---------->dyn_nxt
 ctin    ub              1       from    ub                      1  i    j    k    t-1

trunk/src/solsor_flag.h

@@ -20 +20 @@
   //jn (current iteration) = Yk
   
-  if ( (Yk<=nmin) | (Yt==TU) )
+  if ( ((Yk<=nmin) | (Yt==TU)) | ((Yk-nmin)%nmod != 0))
     {
       YS1=0;
@@ -39 +39 @@
         else YS1 = ((x4<x1) ? x1 : x4) ; // max(x1,x4)
         if ( ( (Yi==NX-1) & (Yj ==NY-1) ) & (YS1< resmax)) 
-          {YS2=1;} //moment de tester le maximum       
+          {
+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+1) printf("%d\t%d\t%d\t%e\t%d\n",Yk,Yj,Yi,YS1,(int)YS2); 
+        //      if (Yt==TU+2) printf("%d\t%d\t%d\t%e\t%d\n",Yk,Yj,Yi,YS1,(int)YS2); 
 
 } //Yk>kmin

trunk/src/solsor_gx1_x_r.h

@@ -75 +75 @@
       } //if x8==0
 if (Yt==TU+1) 
-  printf("%d\t%d\t%d\t%e\t%e\n",Yk,Yj,Yi,YS1,YS2);  
+  printf("%d\t%d\t%d\t%e\t%e (1)\n",Yk,Yj,Yi,YS1,YS2);  
 } //Yt>TU
 }

trunk/src/solsor_gx2_x_r.h

@@ -70 +70 @@
        } // Yk>0
      } //if x8==0
+if (Yt==TU+1) 
+  printf("%d\t%d\t%d\t%e\t%e (2)\n",Yk,Yj,Yi,YS1,YS2);  
  } //Yt>TU
 }