Changeset 477 for branches

Timestamp:

02/07/24 17:26:41 (4 months ago)

Author:

aquiquet

Message:

Cleaning branch: determin_front and determin_marais with explicit arguments

Location:

branches/GRISLIv3/SOURCES

Files:

• flottab2-0.7.f90 (modified) (23 diffs)
• steps_time_loop.f90 (modified) (2 diffs)

branches/GRISLIv3/SOURCES/flottab2-0.7.f90

@@ -17 +17 @@
 
   !$ USE OMP_LIB
-  USE geography, only: nx,ny
 
   implicit none
@@ -66 +65 @@
     
     use runparam, only:itracebug,nt
+    use geography, only:nx,ny
     use module3D_phy, only:igrdline,mk_init,flot,H,sealevel_2d,Bsoc,S,H,B,&
          ice,front,&
@@ -342 +342 @@
     !$OMP END PARALLEL
 
-    call determin_front_tof
+    call determin_front_tof(front,ice)
 
     ! pour sorties initMIP:
@@ -356 +356 @@
   !>
   subroutine determin_tache
-    
+
+    use geography, only:nx,ny
     use module3D_phy, only:ice,flot,gzmx,gzmy,S,flgzmx,flgzmy,sealevel,time,iceberg,&
          debug_3D
@@ -552 +553 @@
   !!Routine pour la determination du front
   !>
-  subroutine determin_front
-
-    use module3D_phy, only:ice,H,front
-
+  subroutine determin_front(ice,H,front)
     
 !!$ USE OMP_LIB
     implicit none
-    
+
+    integer,dimension(:,:), intent(inout) :: ice,front
+    real, dimension(:,:),   intent(inout) :: H
+
+    integer :: nxl,nyl
     integer :: pmx,pmy !pm=plus-moins -1 ou 1 pour x et y 
     integer :: i,j,k
@@ -565 +567 @@
     integer :: j_moins1,j_plus1,j_plus2
 
+    nxl=ubound(ice,1)
+    nyl=ubound(ice,2)
+
     !$OMP PARALLEL
     !$OMP DO
-    do j=3,ny-2
-       do i=3,nx-2
+    do j=3,nyl-2
+       do i=3,nxl-2
 
           surice:if  (ice(i,j).eq.0) then
@@ -627 +632 @@
        !$OMP PARALLEL
        !$OMP DO PRIVATE(i_moins1,j_moins1,i_plus1,j_plus1,i_plus2,j_plus2)
-       do j=1,ny
-          do i=1,nx
+       do j=1,nyl
+          do i=1,nxl
 
              surice_xy: if  (ice(i,j).eq.0) then
                 i_moins1=max(i-1,1)
                 j_moins1=max(j-1,1)
-                i_plus1=min(i+1,nx)
-                j_plus1=min(j+1,ny)
-                i_plus2=min(i+2,nx)
-                j_plus2=min(j+2,ny)
+                i_plus1=min(i+1,nxl)
+                j_plus1=min(j+1,nyl)
+                i_plus2=min(i+2,nxl)
+                j_plus2=min(j+2,nyl)
 
                 ! test (iii) pour trouver les baies de largeur 1 ou 2 cases 
@@ -668 +673 @@
     !$OMP PARALLEL
     !$OMP DO
-    do j=2,ny-1
-       do i=2,nx-1
+    do j=2,nyl-1
+       do i=2,nxl-1
 
           if (ice(i,j).eq.1) then     !         test si ice=1
@@ -687 +692 @@
 
     !$OMP DO PRIVATE(i)
-    do j=2,ny-1
+    do j=2,nyl-1
        i=1
        front(i,j)=(ice(i+1,j)+ice(i,j+1)+ice(i,j-1))
-       i=nx
+       i=nxl
        front(i,j)=(ice(i-1,j)+ice(i,j+1)+ice(i,j-1))
     end do
@@ -696 +701 @@
 
     !$OMP DO PRIVATE(j)
-    do i=2,nx-1
+    do i=2,nxl-1
        j=1 
        front(i,j)=(ice(i-1,j)+ice(i+1,j)+ice(i,j+1))
-       j=ny
+       j=nyl
        front(i,j)=(ice(i-1,j)+ice(i+1,j)+ice(i,j-1))
     end do
@@ -707 +712 @@
 
     front(1,1)=ice(2,1)+ice(2,1)
-    front(1,ny)=ice(2,ny)+ice(1,ny-1)
-    front(nx,1)=ice(nx,2)+ice(nx-1,1)
-    front(nx,ny)=ice(nx,ny-1)+ice(nx-1,ny)
+    front(1,nyl)=ice(2,nyl)+ice(1,nyl-1)
+    front(nxl,1)=ice(nxl,2)+ice(nxl-1,1)
+    front(nxl,nyl)=ice(nxl,nyl-1)+ice(nxl-1,nyl)
 
 
@@ -718 +723 @@
 
     !$OMP DO 
-    do j=1,ny
-       do i=1,nx-1
+    do j=1,nyl
+       do i=1,nxl-1
           if (front(i,j).eq.1) then
              if (front(i+1,j).eq.1) then
@@ -733 +738 @@
 
     !$OMP DO 
-    do j=1,ny-1
-       do i=1,nx
+    do j=1,nyl-1
+       do i=1,nxl
           if (front(i,j).eq.1) then
              if (front(i,j+1).eq.1) then
@@ -753 +758 @@
   !------------------------------------------------------------------------------
 
-  subroutine determin_front_tof
-
-    use module3D_phy, only:front,ice
+  subroutine determin_front_tof(front,ice)
 
     implicit none
-    
+
+    integer, dimension(:,:), intent(inout) :: front,ice
+    
+    integer :: nxl,nyl
     integer :: i,j
-    integer,dimension(nx,ny) :: nofront ! tableau de travail (points au dela du front)
+    integer,dimension(ubound(ice,1),ubound(ice,2)) :: nofront ! tableau de travail (points au dela du front)
+
+    nxl=ubound(ice,1)
+    nyl=ubound(ice,2)
+
     !$OMP PARALLEL
     !$OMP DO
-    do j=2,ny-1
-       do i=2,nx-1
+    do j=2,nyl-1
+       do i=2,nxl-1
 
           if (ice(i,j).eq.1) then     !         test si ice=1
@@ -782 +792 @@
 
     !$OMP DO PRIVATE(i)
-    do j=2,ny-1
+    do j=2,nyl-1
        i=1
        front(i,j)=(ice(i+1,j)+ice(i,j+1)+ice(i,j-1))
-       i=nx
+       i=nxl
        front(i,j)=(ice(i-1,j)+ice(i,j+1)+ice(i,j-1))
     end do
@@ -791 +801 @@
 
     !$OMP DO PRIVATE(j)
-    do i=2,nx-1
+    do i=2,nxl-1
        j=1 
        front(i,j)=(ice(i-1,j)+ice(i+1,j)+ice(i,j+1))
-       j=ny
+       j=nyl
        front(i,j)=(ice(i-1,j)+ice(i+1,j)+ice(i,j-1))
     end do
@@ -802 +812 @@
 
     front(1,1)=ice(2,1)+ice(2,1)
-    front(1,ny)=ice(2,ny)+ice(1,ny-1)
-    front(nx,1)=ice(nx,2)+ice(nx-1,1)
-    front(nx,ny)=ice(nx,ny-1)+ice(nx-1,ny)
+    front(1,nyl)=ice(2,nyl)+ice(1,nyl-1)
+    front(nxl,1)=ice(nxl,2)+ice(nxl-1,1)
+    front(nxl,nyl)=ice(nxl,nyl-1)+ice(nxl-1,nyl)
 
     ! Les points à plus d'un point de grille du bord sont front=-1
@@ -813 +823 @@
 
     !$OMP DO
-    do j=2,ny-1
-       do i=2,nx-1
+    do j=2,nyl-1
+       do i=2,nxl-1
           if ((ice(i,j).eq.0).and.(front(i-1,j)+front(i+1,j)+front(i,j-1)+front(i,j+1)).eq.0) then
              nofront(i,j)=-1
@@ -838 +848 @@
   !! Copie sauvage de determin_tache, adapte au probleme du marais
   !>
-  subroutine determin_marais
-    
-    use module3D_phy, only:ice,flot,flot_marais,debug_3D
+  subroutine determin_marais(ice,flot,flot_marais,debug_3D)
+
     !$ USE OMP_LIB
 
     implicit none
-    
+
+    integer,dimension(:,:),intent(inout) :: ice
+    logical,dimension(:,:),intent(inout) :: flot,flot_marais
+    real,dimension(:,:,:), intent(inout) :: debug_3D
+   
     integer,parameter               :: n_ta_max=2000!< nombre de tache max
 
+    integer :: nxl,nyl
     integer :: i,j
     integer :: indice
@@ -854 +868 @@
     integer,dimension(mask_nb) :: mask ! numero de tache des points adjacents
 
-    integer,dimension(nx,ny)          :: table_out_marais    !< numeros de tache d'un point ij
+    integer,dimension(ubound(ice,1),ubound(ice,2))    :: table_out_marais    !< numeros de tache d'un point ij
     integer,dimension(0:n_ta_max)     :: compt_marais        !< contient les equivalence entre les taches
     integer,dimension(0:n_ta_max)     :: nb_pts_marais       !< indique le nombre de points par tache
@@ -862 +876 @@
     ! 1-initialisation
     !-----------------
+    nxl=ubound(ice,1)
+    nyl=ubound(ice,2)
     label_max=1      ! numero de la tache, la premiere tache est notée 1
     label=1
@@ -878 +894 @@
     !----------------------
 
-    do j=2,ny-1
-       do i=2,nx-1
+    do j=2,nyl-1
+       do i=2,nxl-1
           if ((ice(i,j).ge.1).and.flot(i,j)) then ! on est sur la glace qui flotte-------------------!
 
@@ -936 +952 @@
     !$OMP PARALLEL
     !$OMP DO
-    do j=1,ny
-       do i=1,nx
+    do j=1,nyl
+       do i=1,nxl
           if (table_out_marais(i,j).ne.0) then
              nb_pts_marais(compt_marais(table_out_marais(i,j)))= nb_pts_marais(compt_marais(table_out_marais(i,j)))+1   

branches/GRISLIv3/SOURCES/steps_time_loop.f90

@@ -16 +16 @@
   use module3d_phy, only: ispinup,isynchro,timemax,time,flot,S,B,Bsoc,H,sealevel_2d,hmx,hmy,&
        ice,bm,bmelt,ablbord,ablbord_dtt,dt, &
-       uxbar,uybar,hdot,dtmax,dtmin,iout
+       uxbar,uybar,hdot,dtmax,dtmin,iout,flot_marais,debug_3D
   use runparam, only: itracebug,nt,num_tracebug
   use equat_adv_diff_2D_vect, only: icethick3
@@ -65 +65 @@
      call bilan_flux_output     
      call flottab
-     if (isynchro.eq.1.or.nt.eq.1) call determin_marais
+     if (isynchro.eq.1.or.nt.eq.1) call determin_marais(ice,flot,flot_marais,debug_3D)
      if (itracebug.eq.1)  call tracebug('apres marais')