add multi-block functionality to pastr

Author: fangjian

pastr/src/pastr_commvar.F90

@@ -1,10 +1,12 @@
 module pastr_commvar
 
     use iso_fortran_env, only: wp => real64
+    use pastr_constdef
 
     implicit none
 
     integer :: im, jm, km
+    integer :: nhalo=4
 
     logical :: nondimen=.true.
     logical :: lihomo, ljhomo, lkhomo
@@ -16,6 +18,9 @@ module pastr_commvar
                 const2, const3, const4, const5, const6, const7, const8, roinf, &
                 uinf, vinf, tinf, pinf
     real(wp) :: deltat    
+    real(wp) :: lx,ly,lz
+
+    real(wp),pointer :: stencil_1(:)
 
     real(wp), allocatable, dimension(:, :, :) :: x, y, z, ro, u1, u2, u3, p, t
     real(wp), allocatable, dimension(:, :, :) :: ro_m, u1_m, u2_m, u3_m, p_m, t_m
@@ -36,46 +41,7 @@ module pastr_commvar
       procedure :: init => alloc_monitor
     end type montype
 
-    type :: conntype
-
-      integer :: nblock_local,npatch_local
-      integer :: nblock_remot,npatch_remot
-
-    end type conntype
-
-    type :: pachtype
-      
-      integer :: imin,imax,jmin,jmax,kmin,kmax
-
-      character(len=1) :: ntyp ! internal (i) or bc (n)
-      
-      type(conntype),allocatable :: connector(:)
-
-      character(len=6),allocatable :: varname(:)
-
-      real(wp),allocatable :: x(:,:,:,:),var(:,:,:,:)
-
-
-    end type pachtype
-
-    type :: bloktype
-
-      integer :: im,jm,km
-      integer :: nvar,nhalo,npatch
-
-      character(len=6) :: name
-
-      character(len=6),allocatable :: varname(:)
-
-      real(wp),allocatable :: x(:,:,:,:),var(:,:,:,:)
-
-      type(pachtype),allocatable :: patch(:)
-
-      contains
-
-      procedure :: init => alloc_block
-
-    end type bloktype
+    
 
 
 contains
@@ -91,24 +57,5 @@ subroutine alloc_monitor(amonitor)
 
   end subroutine alloc_monitor
 
-    subroutine alloc_block(ablock)
-
-    class(bloktype),target :: ablock
-
-    ablock%nhalo=4
-
-    allocate(ablock%varname(ablock%nvar))
-    allocate(ablock%x( -ablock%nhalo:ablock%im+ablock%nhalo, &
-                       -ablock%nhalo:ablock%jm+ablock%nhalo, &
-                       -ablock%nhalo:ablock%km+ablock%nhalo,3) )
-    allocate(ablock%var(-ablock%nhalo:ablock%im+ablock%nhalo, &
-                        -ablock%nhalo:ablock%jm+ablock%nhalo, &
-                        -ablock%nhalo:ablock%km+ablock%nhalo, ablock%nvar))
-
-    allocate(ablock%patch(ablock%npatch))
-
-    print*,' ** block ',ablock%name,' initiated.'
-
-  end subroutine alloc_block
-
+  
 end module pastr_commvar

pastr/src/pastr_gradients.F90

@@ -1,15 +1,11 @@
 module pastr_gradients
 
     use iso_fortran_env, only: wp => real64
-    use pastr_commvar, only: im,jm,km,lihomo,ljhomo,lkhomo
+    use pastr_commvar, only: im,jm,km,lihomo,ljhomo,lkhomo,nhalo
     use pastr_constdef
 
     implicit none
 
-    private
-
-    public ::  grad_xy,grad_3d
-
 contains
 
     function grad_3d(f,x,y,z) result(df)

pastr/src/pastr_io.F90

@@ -101,7 +101,7 @@ end subroutine read_grid_2d
 
     subroutine read_grid_3d(x,y,z)
 
-      use pastr_commvar, only: gridfile,im,jm,km
+      use pastr_commvar, only: gridfile,im,jm,km,lx,ly,lz
       use pastr_h5io
 
       real(wp),intent(inout),allocatable :: x(:,:,:),y(:,:,:),z(:,:,:)
@@ -110,6 +110,10 @@ subroutine read_grid_3d(x,y,z)
       call H5ReadArray(y,im,jm,km,'y',trim(gridfile))
       call H5ReadArray(z,im,jm,km,'z',trim(gridfile))
 
+      lx=x(im,0,0)-x(0,0,0)
+      ly=y(0,jm,0)-y(0,0,0)
+      lz=z(0,0,km)-z(0,0,0)
+
     end subroutine read_grid_3d
 
     subroutine read_monitor_data(num_first_file,num_last_file,n_data,n_col,mon_data)