Changeset 175 for trunk

Timestamp:

01/17/18 17:58:22 (6 years ago)

Author:

dumas

Message:

fixed a bug on xpos and ypos test in furst_shoof module

File:

• trunk/SOURCES/furst_schoof_mod.f90 (modified) (6 diffs)

trunk/SOURCES/furst_schoof_mod.f90

@@ -102 +102 @@
               xpos_tab(i,j)=xpos
               Hglx_tab(i,j)=Hgl
-
+              
               if (gr_select.eq.1) then ! flux de Tsai
                  call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),back_force_x(i-1,j),phi_prescr)
@@ -190 +190 @@
               xpos_tab(i,j)=xpos
               Hglx_tab(i,j)=Hgl
+              
               if (gr_select.eq.1) then ! flux de Tsai
                  call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),back_force_x(i+1,j),phi_prescr)
               else if (gr_select.eq.2) then ! flux de Schoof
                  ! afq: the dragging coef. is on the staggered grid, the GL can be either West or East to this point.
-                 if (xpos .lt. -dx/2.) then
+                 if (xpos .lt. dx/2.) then
                     frot_coef = betamx(i,j)
                  else
@@ -205 +206 @@
               endif
               phi_prescr_tabx(i,j)=phi_prescr
-              if (xpos .lt. -dx/2.) then  !  GL a west du i staggered,                          o centre, x stag
+              if (xpos .lt. dx/2.) then  !  GL a west du i staggered,                          o centre, x stag
 
                  !  grille    ! .....x......o......x......o......x......O..G...x......o......x......o
@@ -274 +275 @@
               ypos_tab(i,j)=ypos
               Hgly_tab(i,j)=Hgl
+              
               if (gr_select.eq.1) then ! flux de Tsai
                  call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),back_force_y(i,j-1),phi_prescr)
@@ -355 +357 @@
               ypos_tab(i,j)=ypos
               Hgly_tab(i,j)=Hgl
+              
               if (gr_select.eq.1) then ! flux de Tsai
                  call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),back_force_y(i,j+1),phi_prescr)
               else if (gr_select.eq.2) then ! flux de Schoof
                  ! afq: the dragging coef. is on the staggered grid, the GL can be either South or North to this point.
-                 if (ypos .lt. -dy/2.) then
+                 if (ypos .lt. dy/2.) then
                     frot_coef = betamy(i,j)
                  else
@@ -370 +373 @@
               endif
               phi_prescr_taby(i,j)=phi_prescr
-              if (ypos .lt. -dy/2.) then  !  GL au sud du j staggered,                          o centre, x stag
+              if (ypos .lt. dy/2.) then  !  GL au sud du j staggered,                          o centre, x stag
 
                  !  grille    ! .....x......o......x......o......x......O..G...x......o......x......o