Changeset 176

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.

Location:

trunk/SOURCES

Files:

• New-remplimat/diagno-L2_mod.f90 (modified) (8 diffs)
• furst_schoof_mod.f90 (modified) (10 diffs)

trunk/SOURCES/New-remplimat/diagno-L2_mod.f90

@@ -16 +16 @@
 real, dimension(nx,ny) :: uyb1ramollo
 real, dimension(nx,ny) :: pvi_keep
-
 
 !cdc transfere dans module3d pour compatibilite avec furst_schoof_mod
@@ -86 +85 @@
 end if
 
-
 return
 end subroutine init_diagno
@@ -142 +140 @@
   
   !if (Schoof.eq.1.and.nt.GT.15000) then ! flux grounding line Schoof
-  if (Schoof.eq.1) then ! flux grounding line Schoof
-     call interpol_glflux ! calcul flux GL + interpolation sur voisins
-  endif
+! afq -- below:  if (Schoof.eq.1) then ! flux grounding line Schoof
+! afq -- below:     call interpol_glflux ! calcul flux GL + interpolation sur voisins
+! afq -- below:  endif
 
 !~       do j=1,ny
@@ -190 +188 @@
     pvi_keep(:,:)=pvi(:,:)       
     where (flot(:,:).and.H(:,:).GT.2.)
-       pvi(:,:)=1.e5    
-!       pvi(:,:)=pvimin
+!       pvi(:,:)=1.e5    
+       pvi(:,:)=pvimin
     endwhere
 
@@ -210 +208 @@
        back_force_y(:,:)=1.
     endwhere
+    back_force_x(:,:) = min ( back_force_x(:,:), 1. )
+    back_force_y(:,:) = min ( back_force_y(:,:), 1. )
+    debug_3D(:,:,64) = back_force_x(:,:)
+    debug_3D(:,:,65) = back_force_y(:,:)
 
     if (ifail_diagno_ramollo.gt.0) then
@@ -228 +230 @@
 
 !~   print*,'apres calcul rempli_L2'
-!~   read(*,*)      
+!~   read(*,*)
+    
+    call interpol_glflux ! calcul flux GL + interpolation sur voisins
+    
+    call rempli_L2(nxd1,nxd2,nyd1,nyd2,uxbar(nxd1:nxd2,nyd1:nyd2),uybar(nxd1:nxd2,nyd1:nyd2), & 
+       uxb1(nxd1:nxd2,nyd1:nyd2),uyb1(nxd1:nxd2,nyd1:nyd2),  &
+       imx_diag(nxd1:nxd2,nyd1:nyd2),imy_diag(nxd1:nxd2,nyd1:nyd2),ifail_diagno)
+  
   endif
   
@@ -416 +425 @@
          endif
          pvi(i,j)=pvi(i,j)+visc(i,j,k)
-         Abar(i,j) =(Bt2/2.)**(-1./3.) + Abar(i,j) 
-
+         Abar(i,j) =(Bt2/2.)**(-1./3.) + Abar(i,j)
+         
          Taushelf(i,j)=Taushelf(i,j)+ttau
 
@@ -427 +436 @@
       pvi(i,j)  = pvi(i,j)*H(i,j)/nz
       Abar(i,j) = (Abar(i,j) /nz)**(-3.)
-     
+      
 
       Taushelf(i,j)=Taushelf(i,j)/nz

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