Changeset 176 for trunk/SOURCES/furst_schoof_mod.f90

Timestamp:

01/30/18 11:28:30 (6 years ago)

Author:

aquiquet

Message:

Schoof/Tsai?: buttressing explicitly computed w/o shelves: 3 calls to diagno L2.

File:

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

trunk/SOURCES/furst_schoof_mod.f90

@@ -57 +57 @@
   real :: toutpetit = 1e-6
   real :: denom, prodscal
+
+  real :: bfx, bfy
 
   !debug
@@ -103 +105 @@
               Hglx_tab(i,j)=Hgl
               
+              ! afq: the back force is on the staggered grid, the GL can be either West or East to this point.
+              if (xpos .lt. -dx/2.) then
+                 bfx = back_force_x(i,j)
+              else
+                 bfx = back_force_x(i+1,j)
+              endif
               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)
+                 call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),bfx,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.
@@ -112 +120 @@
                     frot_coef = betamx(i+1,j)
                  endif
-                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,back_force_x(i-1,j),phi_prescr)
+                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,bfx,phi_prescr)
               else
                  print*,'ATTENTION FLUX AUTRE QUE TSAI OU SCHOOF NON IMPLEMENTE'
@@ -191 +199 @@
               Hglx_tab(i,j)=Hgl
               
+              ! afq: the back force is on the staggered grid, the GL can be either West or East to this point.
+              if (xpos .lt. dx/2.) then
+                 bfx = back_force_x(i,j)
+              else
+                 bfx = back_force_x(i+1,j)
+              endif
               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)
+                 call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),bfx,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.
@@ -200 +214 @@
                     frot_coef = betamx(i+1,j)
                  endif
-                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,back_force_x(i+1,j),phi_prescr)
+                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,bfx,phi_prescr)
               else
                  print*,'ATTENTION FLUX AUTRE QUE TSAI OU SCHOOF NON IMPLEMENTE'
@@ -276 +290 @@
               Hgly_tab(i,j)=Hgl
               
+              ! afq: the back force is on the staggered grid, the GL can be either South or North to this point.
+              if (ypos .lt. -dy/2.) then
+                 bfy = back_force_y(i,j)
+              else
+                 bfy = back_force_y(i,j+1)
+              endif
               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)
+                 call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),bfy,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.
@@ -285 +305 @@
                     frot_coef = betamy(i,j+1)
                  endif
-                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,back_force_y(i,j-1),phi_prescr)
+                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,bfy,phi_prescr)
               else
                  print*,'ATTENTION FLUX AUTRE QUE TSAI OU SCHOOF NON IMPLEMENTE'
@@ -358 +378 @@
               Hgly_tab(i,j)=Hgl
               
+              ! afq: the back force is on the staggered grid, the GL can be either South or North to this point.
+              if (ypos .lt. dy/2.) then
+                 bfy = back_force_y(i,j)
+              else
+                 bfy = back_force_y(i,j+1)
+              endif
               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)
+                 call flux_Tsai4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),bfy,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.
@@ -367 +393 @@
                     frot_coef = betamy(i,j+1)
                  endif
-                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,back_force_y(i,j+1),phi_prescr)
+                 call flux_Schoof4Schoof (Hgl,Abar(i,j),frot_coef,alpha_flot,glen(1),m_weert,bfy,phi_prescr)
               else
                  print*,'ATTENTION FLUX AUTRE QUE TSAI OU SCHOOF NON IMPLEMENTE'
@@ -474 +500 @@
 !!$     enddo
 !!$  enddo
+
+  debug_3D(:,:,66) = phi_prescr_tabx(:,:)
+  debug_3D(:,:,67) = phi_prescr_taby(:,:)
+  
 end subroutine interpol_glflux