Jgfouca/homme/bring in as subtree

models/atm/cam/bld/configure

@@ -2681,7 +2681,7 @@ sub write_filepath
 
     print $fh "$srcdir/atm/cam/src/dynamics/$dyn\n";
     if($dyn eq 'se') {
-	print $fh "$srcdir/atm/cam/src/dynamics/se/share\n";
+	print $fh "$srcdir/atm/homme/src/share\n";
     }
 
     # Parallelization utilies

models/atm/cam/src/dynamics/se/gravity_waves_sources.F90

@@ -1,7 +1,7 @@
 module gravity_waves_sources
   use derivative_mod, only : derivative_t
   use dimensions_mod, only : np,nlev
-  use edge_mod, only       : EdgeBuffer_t
+  use edgetype_mod, only       : EdgeBuffer_t
   use element_mod, only    : element_t
   use hybrid_mod, only     : hybrid_t
   use kinds, only          : real_kind
@@ -29,14 +29,17 @@ module gravity_waves_sources
 CONTAINS
 !----------------------------------------------------------------------
 
-  subroutine gws_init
+  subroutine gws_init(elem)
     use edge_mod, only       : initEdgeBuffer
     use hycoef, only         : hypi
     use pmgrid, only         : plev
+    use parallel_mod, only    : par
     implicit none
+    type (element_t), intent(inout), dimension(:) :: elem
+
 
     ! Set up variables similar to dyn_comp and prim_driver_mod initializations
-    call initEdgeBuffer(edge3,3*nlev)
+    call initEdgeBuffer(par,edge3,elem,3*nlev)
     allocate(deriv(0:Nthreads-1))
 
     psurf_ref = hypi(plev+1)
@@ -144,13 +147,13 @@ subroutine compute_frontogenesis(frontgf,frontga,tl,elem,ederiv,hybrid,nets,nete
 
        enddo
        ! pack
-       call edgeVpack(edge3, frontgf(:,:,:,ie),nlev,0,elem(ie)%desc)
-       call edgeVpack(edge3, gradth(:,:,:,:,ie),2*nlev,nlev,elem(ie)%desc)
+       call edgeVpack(edge3, frontgf(:,:,:,ie),nlev,0,ie)
+       call edgeVpack(edge3, gradth(:,:,:,:,ie),2*nlev,nlev,ie)
     enddo
     call bndry_exchangeV(hybrid,edge3)
     do ie=nets,nete
-       call edgeVunpack(edge3, frontgf(:,:,:,ie),nlev,0,elem(ie)%desc)
-       call edgeVunpack(edge3, gradth(:,:,:,:,ie),2*nlev,nlev,elem(ie)%desc)
+       call edgeVunpack(edge3, frontgf(:,:,:,ie),nlev,0,ie)
+       call edgeVunpack(edge3, gradth(:,:,:,:,ie),2*nlev,nlev,ie)
        ! apply inverse mass matrix,
        do k=1,nlev
           gradth(:,:,1,k,ie)=gradth(:,:,1,k,ie)*elem(ie)%rspheremp(:,:)

models/atm/cam/src/dynamics/se/inidat.F90

@@ -35,7 +35,8 @@ subroutine read_inidat( ncid_ini, ncid_topo, dyn_in)
     use constituents, only: cnst_name, cnst_read_iv, qmin
     use dimensions_mod,     only: nelemd, nlev, np
     use dof_mod, only           : putUniquePoints
-    use edge_mod, only : edgevpack, edgevunpack, InitEdgeBuffer, FreeEdgeBuffer, EdgeBuffer_t
+    use edge_mod, only : edgevpack, edgevunpack, InitEdgeBuffer, FreeEdgeBuffer
+    use edgetype_mod, only : EdgeBuffer_t
     use ncdio_atm, only : infld
     use shr_vmath_mod, only: shr_vmath_log
     use hycoef,           only: ps0
@@ -287,34 +288,34 @@ subroutine read_inidat( ncid_ini, ncid_topo, dyn_in)
     ! once we've read all the fields we do a boundary exchange to 
     ! update the redundent columns in the dynamics
     if(iam < par%nprocs) then
-       call initEdgeBuffer(edge, (3+pcnst)*nlev+2)
+       call initEdgeBuffer(par, edge, elem, (3+pcnst)*nlev+2)
     end if
     do ie=1,nelemd
        kptr=0
-       call edgeVpack(edge, elem(ie)%state%ps_v(:,:,1),1,kptr,elem(ie)%desc)
+       call edgeVpack(edge, elem(ie)%state%ps_v(:,:,1),1,kptr,ie)
        kptr=kptr+1
-       call edgeVpack(edge, elem(ie)%state%phis,1,kptr,elem(ie)%desc)
+       call edgeVpack(edge, elem(ie)%state%phis,1,kptr,ie)
        kptr=kptr+1
-       call edgeVpack(edge, elem(ie)%state%v(:,:,:,:,1),2*nlev,kptr,elem(ie)%desc)
+       call edgeVpack(edge, elem(ie)%state%v(:,:,:,:,1),2*nlev,kptr,ie)
        kptr=kptr+2*nlev
-       call edgeVpack(edge, elem(ie)%state%T(:,:,:,1),nlev,kptr,elem(ie)%desc)
+       call edgeVpack(edge, elem(ie)%state%T(:,:,:,1),nlev,kptr,ie)
        kptr=kptr+nlev
-       call edgeVpack(edge, elem(ie)%state%Q(:,:,:,:),nlev*pcnst,kptr,elem(ie)%desc)
+       call edgeVpack(edge, elem(ie)%state%Q(:,:,:,:),nlev*pcnst,kptr,ie)
     end do
     if(iam < par%nprocs) then
        call bndry_exchangeV(par,edge)
     end if
     do ie=1,nelemd
        kptr=0
-       call edgeVunpack(edge, elem(ie)%state%ps_v(:,:,1),1,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, elem(ie)%state%ps_v(:,:,1),1,kptr,ie)
        kptr=kptr+1
-       call edgeVunpack(edge, elem(ie)%state%phis,1,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, elem(ie)%state%phis,1,kptr,ie)
        kptr=kptr+1
-       call edgeVunpack(edge, elem(ie)%state%v(:,:,:,:,1),2*nlev,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, elem(ie)%state%v(:,:,:,:,1),2*nlev,kptr,ie)
        kptr=kptr+2*nlev
-       call edgeVunpack(edge, elem(ie)%state%T(:,:,:,1),nlev,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, elem(ie)%state%T(:,:,:,1),nlev,kptr,ie)
        kptr=kptr+nlev
-       call edgeVunpack(edge, elem(ie)%state%Q(:,:,:,:),nlev*pcnst,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, elem(ie)%state%Q(:,:,:,:),nlev*pcnst,kptr,ie)
     end do
 
 !$omp parallel do private(ie, t, m_cnst)

models/atm/cam/src/dynamics/se/interp_mod.F90

@@ -112,7 +112,8 @@ subroutine write_interpolated_scalar(File, varid, fld, numlev, data_type, decomp
     use dof_mod, only : PutUniquePoints
     use interpolate_mod, only : get_interp_parameter
     use shr_pio_mod, only : shr_pio_getiosys
-    use edge_mod, only : edgebuffer_t, edgevpack, edgevunpack, initedgebuffer, freeedgebuffer
+    use edge_mod, only : edgevpack, edgevunpack, initedgebuffer, freeedgebuffer
+    use edgetype_mod, only : edgebuffer_t
     use bndry_mod, only : bndry_exchangeV
     use parallel_mod,   only: par
     use cam_abortutils, only : endrun
@@ -203,18 +204,18 @@ subroutine write_interpolated_scalar(File, varid, fld, numlev, data_type, decomp
 
        end if
        allocate(dest(np,np,numlev,nelemd))
-       call initEdgeBuffer(edgebuf, numlev)
+       call initEdgeBuffer(hybrid%par,edgebuf, elem,numlev)
 
        do ie=1,nelemd
           ncols = elem(ie)%idxp%NumUniquePts
           call putUniquePoints(elem(ie)%idxP, numlev, fld_dyn(1:ncols,:,ie), dest(:,:,:,ie))
-          call edgeVpack(edgebuf, dest(:,:,:,ie), numlev, 0, elem(ie)%desc)
+          call edgeVpack(edgebuf, dest(:,:,:,ie), numlev, 0, ie)
        enddo
        if(iam < par%nprocs) then
           call bndry_exchangeV(par, edgebuf)
        end if
        do ie=1,nelemd
-          call edgeVunpack(edgebuf, dest(:,:,:,ie), numlev, 0, elem(ie)%desc)
+          call edgeVunpack(edgebuf, dest(:,:,:,ie), numlev, 0, ie)
        end do
        call freeEdgeBuffer(edgebuf)
        usefillvalues = any(dest == fillvalue)
@@ -299,7 +300,8 @@ subroutine write_interpolated_vector(File, varidu, varidv, fldu, fldv, numlev, d
     use dof_mod, only : PutUniquePoints
     use interpolate_mod, only : get_interp_parameter
     use shr_pio_mod, only : shr_pio_getiosys
-    use edge_mod, only : edgebuffer_t, edgevpack, edgevunpack, initedgebuffer, freeedgebuffer
+    use edge_mod, only : edgevpack, edgevunpack, initedgebuffer, freeedgebuffer
+    use edgetype_mod, only : edgebuffer_t
     use bndry_mod, only : bndry_exchangeV
     use parallel_mod,   only: par
     implicit none
@@ -395,20 +397,20 @@ subroutine write_interpolated_vector(File, varidu, varidv, fldu, fldv, numlev, d
           deallocate( cbuffer )
 
        end if
-       call initEdgeBuffer(edgebuf, 2*numlev)
+       call initEdgeBuffer(hybrid%par,edgebuf,elem, 2*numlev)
 
        do ie=1,nelemd
           ncols = elem(ie)%idxp%NumUniquePts
           call putUniquePoints(elem(ie)%idxP, 2, numlev, fld_dyn(1:ncols,:,:,ie), dest(:,:,:,:,ie))
 
-          call edgeVpack(edgebuf, dest(:,:,:,:,ie), 2*numlev, 0, elem(ie)%desc)
+          call edgeVpack(edgebuf, dest(:,:,:,:,ie), 2*numlev, 0, ie)
        enddo
        if(iam < par%nprocs) then
           call bndry_exchangeV(par, edgebuf)
        end if
 
        do ie=1,nelemd
-          call edgeVunpack(edgebuf, dest(:,:,:,:,ie), 2*numlev, 0, elem(ie)%desc)
+          call edgeVunpack(edgebuf, dest(:,:,:,:,ie), 2*numlev, 0, ie)
        enddo
        call freeEdgeBuffer(edgebuf)
        usefillvalues = any(dest==fillvalue)

models/atm/cam/src/dynamics/se/nctopo_util_mod.F90

@@ -35,7 +35,8 @@ subroutine nctopo_util_inidat( ncid_topo, iodesc, elem)
     use parallel_mod,     only: par
     use bndry_mod,     only: bndry_exchangev
     use dof_mod, only           : putUniquePoints
-    use edge_mod, only : edgevpack, edgevunpack, InitEdgeBuffer, FreeEdgeBuffer, EdgeBuffer_t
+    use edge_mod, only : edgevpack, edgevunpack, InitEdgeBuffer, FreeEdgeBuffer
+    use edgetype_mod, only : EdgeBuffer_t
     use ncdio_atm, only : infld
     use cam_abortutils,     only: endrun
     use pio, only : file_desc_t, io_desc_t, pio_double, pio_get_local_array_size, pio_freedecomp
@@ -105,23 +106,23 @@ subroutine nctopo_util_inidat( ncid_topo, iodesc, elem)
     end do
 
     ! update non-unique points:
-    call initEdgeBuffer(edge, 3)
+    call initEdgeBuffer(par, edge, elem, 3)
     do ie=1,nelemd
        kptr=0
-       call edgeVpack(edge, SGH30dyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVpack(edge, SGH30dyn(:,:,ie),1,kptr,ie)
        kptr=kptr+1
-       call edgeVpack(edge, SGHdyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVpack(edge, SGHdyn(:,:,ie),1,kptr,ie)
        kptr=kptr+1
-       call edgeVpack(edge, PHISdyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVpack(edge, PHISdyn(:,:,ie),1,kptr,ie)
     end do
     call bndry_exchangeV(par,edge)
     do ie=1,nelemd
        kptr=0
-       call edgeVunpack(edge, SGH30dyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, SGH30dyn(:,:,ie),1,kptr,ie)
        kptr=kptr+1
-       call edgeVunpack(edge, SGHdyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, SGHdyn(:,:,ie),1,kptr,ie)
        kptr=kptr+1
-       call edgeVunpack(edge, PHISdyn(:,:,ie),1,kptr,elem(ie)%desc)
+       call edgeVunpack(edge, PHISdyn(:,:,ie),1,kptr,ie)
     end do
     call FreeEdgeBuffer(edge)
 

models/atm/cam/src/dynamics/se/pmgrid.F90

@@ -1,5 +1,5 @@
 module pmgrid
-  use edge_mod, only : EdgeBuffer_t
+  use edgetype_mod, only : EdgeBuffer_t
   use dimensions_mod, only : nnodes,npart,nmpi_per_node
   use reduction_mod, only : ReductionBuffer_ordered_1d_t
 

models/atm/cam/src/dynamics/se/restart_dynamics.F90

@@ -337,8 +337,6 @@ subroutine read_restart_dynamics (File, dyn_in, dyn_out, NLFileName)
     use namelist_mod, only: readnl
     use constituents, only : cnst_name
     use bndry_mod,   only: bndry_exchangeV
-    use edge_mod,       only: EdgeBuffer_t, initEdgeBuffer, FreeEdgeBuffer, &
-         edgeVpack, edgeVunpack
     use cam_pio_utils, only : pio_subsystem
     use spmd_dyn, only: spmd_readnl
     use fvm_control_volume_mod, only: fvm_struct
@@ -361,7 +359,6 @@ subroutine read_restart_dynamics (File, dyn_in, dyn_out, NLFileName)
     type(fvm_struct), pointer :: fvm(:)
     integer(kind=PIO_OFFSET), parameter :: t = 1
     integer :: i, k, cnt, st, en, tl, tlQdp, ii, jj, s2d, q, j
-    type(EdgeBuffer_T) :: edgebuf
     integer :: timelevel_dimid, timelevel_chk
     integer :: npes_se
 !    type(file_desc_t) :: ncid