Changeset 109

Timestamp:

05/19/17 17:44:41 (7 years ago)

Author:

dumas

Message:

Add gr_line_schoof variable to identify schoof points

Location:

trunk/SOURCES

Files:

• 3D-physique-gen_mod.f90 (modified) (1 diff)
• furst_schoof_mod.f90 (modified) (17 diffs)

trunk/SOURCES/3D-physique-gen_mod.f90

@@ -229 +229 @@
   integer,dimension(nx,ny) :: FRONTFACEX!< type de front sur les faces x
   integer,dimension(nx,ny) :: FRONTFACEY!< type de front sur les faces y
+  integer,dimension(nx,ny) :: gr_line_schoof ! points ou on impose le flux de schoof (pour sorties)
   integer,dimension(nx,ny) :: ICE       !< presence de glace au point considere,
   !< seuil 0 si pose, 1 si flottant

trunk/SOURCES/furst_schoof_mod.f90

@@ -83 +83 @@
   countx(:,:)=0.
   county(:,:)=0.
-
+  gr_line_schoof(:,:)=0
+  
   archimtab(:,:) = Bsoc(:,:)+H(:,:)*alpha_flot -sealevel
 
@@ -127 +128 @@
                  countx   (i-1,j)   = countx(i-1,j)+1
                  imx_diag (i-1,j)   = 1
-
+                 gr_line_schoof(i-1,j) = 1
+                                                                 
                  ! extrapolation pour avoir uxbar(i,j)
 
@@ -136 +138 @@
                  countx   (i,j)   = countx(i,j)+1
                  imx_diag (i,j)   = 1
+                 gr_line_schoof(i,j) = 1
                  !                 print*,'schoof uxbar(i,j)=',uxbar(i,j)
                  !                 print*,'Hgl',Hgl
@@ -156 +159 @@
                  countx   (i,j)   = countx(i,j)+1
                  imx_diag (i,j) = 1
-
+                 gr_line_schoof(i,j) = 1
+                                                                 
                  ! extrapolation pour avoir uxbar(i+1,j)
 
@@ -164 +168 @@
                  countx   (i+1,j)   = countx(i+1,j)+1
                  imx_diag (i+1,j)   = 1
+                 gr_line_schoof(i+1,j) = 1
               end if
                                          
@@ -193 +198 @@
                  countx   (i,j)   = countx(i,j)+1
                  imx_diag (i,j) = 1
-
+                 gr_line_schoof(i,j) = 1
+                                                                 
                  ! extrapolation pour avoir uxbar(i+1,j)
 
@@ -201 +207 @@
                  countx   (i+1,j)   = countx(i+1,j)+1
                  imx_diag (i+1,j) = 1
-
+                 gr_line_schoof(i+1,j) = 1
+                                                                 
               else   !  GL a west du i staggered,                          o centre, x stag
 
@@ -216 +223 @@
                  countx   (i+1,j)   = countx(i+1,j)+1
                  imx_diag (i+1,j) = 1
+                 gr_line_schoof(i+1,j) = 1
 
                  ! extrapolation pour avoir uxbar(i+1,j)
@@ -224 +232 @@
                  countx   (i+2,j)   = countx(i+2,j)+1
                  imx_diag (i+2,j) = 1
+                 gr_line_schoof(i+2,j) = 1
               end if
 
@@ -259 +268 @@
                  county   (i,j-1)   = county(i,j-1)+1
                  imy_diag (i,j-1) = 1
+                 gr_line_schoof(i,j-1) = 1
 
                  ! extrapolation pour avoir uybar(i,j)
@@ -267 +277 @@
                  county   (i,j)   = county(i,j)+1
                  imy_diag (i,j) = 1
+                 gr_line_schoof(i,j) = 1
 
               else            !  GL au nord du j staggered,                          o centre, x stag
@@ -282 +293 @@
                  county   (i,j)   = county(i,j)+1
                  imy_diag(i,j) = 1
+                 gr_line_schoof(i,j) = 1
 
                  ! extrapolation pour avoir uybar(i,j+1)
@@ -290 +302 @@
                  county   (i,j+1)   = county(i,j+1)+1
                  imy_diag (i,j+1) = 1
+                 gr_line_schoof(i,j+1) = 1
               end if
               
@@ -319 +332 @@
                  county   (i,j)   = county(i,j)+1
                  imy_diag (i,j) = 1
+                 gr_line_schoof(i,j) = 1
 
                  ! extrapolation pour avoir uybar(i,j+1)
@@ -327 +341 @@
                  county   (i,j+1)   = county(i,j+1)+1
                  imy_diag (i,j+1) = 1
+                 gr_line_schoof(i,j+1) = 1
 
               else   !  GL au nord du j staggered,                          o centre, x stag
@@ -342 +357 @@
                  county   (i,j+1)   = county(i,j+1)+1
                  imy_diag (i,j+1) = 1
-
+                 gr_line_schoof(i,j+1) = 1
+                                                                 
                  ! extrapolation pour avoir uybar(i,j+1)
 
@@ -350 +366 @@
                  county   (i,j+2)   = county(i,j+2)+1
                  imy_diag (i,j+2) = 1
+                 gr_line_schoof(i,j+2) = 1
+                 
               end if