More fixes

Author: jgfouca

components/homme/test_execs/share_kokkos_ut/boundary_exchange_ut.F90

@@ -12,7 +12,7 @@ module boundary_exchange_ut
   subroutine init_edges_structs_f90 (num_min_max_fields_1d,num_scalar_fields_2d,num_scalar_fields_3d,num_scalar_fields_3d_int,num_vector_fields_3d,vector_dim) bind(c)
     use iso_c_binding,  only : c_int
     use dimensions_mod, only : nlev, nlevp, qsize
-    use edge_mod_base,  only : initEdgeBuffer, initEdgeSBuffer
+    use edge_mod,  only : initEdgeBuffer, initEdgeSBuffer
     use geometry_interface_mod, only: par, elem
     !
     ! Inputs
@@ -32,7 +32,7 @@ subroutine boundary_exchange_test_f90 (field_min_1d_ptr, field_max_1d_ptr,
                                          idim_2d, idim_3d, idim_4d, minmax_split) bind(c)
     use iso_c_binding,      only : c_ptr, c_f_pointer, c_int
     use dimensions_mod,     only : np, nlev, nlevp, nelemd, qsize
-    use edge_mod_base,      only : edgevpack, edgevunpack
+    use edge_mod,      only : edgevpack, edgevunpack
     use bndry_mod,          only : bndry_exchangev
     use geometry_interface_mod, only: hybrid
     use viscosity_base,     only : neighbor_minmax, neighbor_minmax_start, neighbor_minmax_finish
@@ -103,7 +103,7 @@ subroutine boundary_exchange_test_f90 (field_min_1d_ptr, field_max_1d_ptr,
   end subroutine boundary_exchange_test_f90
 
   subroutine cleanup_f90 () bind(c)
-    use edge_mod_base, only : FreeEdgeBuffer
+    use edge_mod, only : FreeEdgeBuffer
     use geometry_interface_mod, only: cleanup_geometry_f90
 
     call FreeEdgeBuffer(edge)

components/homme/test_execs/share_kokkos_ut/limiters_interface.F90

@@ -1,7 +1,7 @@
 module limiters_interface_mod
   use dimensions_mod,       only : np, nlev
   use kinds,                only : real_kind
-  use derivative_mod_base,  only : limiter_optim_iter_full, limiter_clip_and_sum
+  use derivative_mod,       only : limiter_optim_iter_full, limiter_clip_and_sum
 
   implicit none
   private

components/homme/test_execs/thetal_kokkos_ut/caar_interface.F90

@@ -10,7 +10,7 @@ subroutine init_caar_f90 (ne, hyai, hybi, hyam, hybm, dvv, mp, ps0) bind(c)
     use iso_c_binding,          only: c_int
     use thetal_test_interface,  only: init_f90
     use dimensions_mod,         only: nlev, nlevp, np
-    use edge_mod_base,          only: initEdgeBuffer, edge_g
+    use edge_mod,          only: initEdgeBuffer, edge_g
     use geometry_interface_mod, only: par, elem
     !
     ! Inputs

components/homme/test_execs/thetal_kokkos_ut/compose_interface.F90

@@ -12,7 +12,7 @@ subroutine init_compose_f90(ne, hyai, hybi, hyam, hybm, ps0, dvv, mp, qsize_in,
     use hybvcoord_mod, only: set_layer_locations
     use thetal_test_interface, only: init_f90
     use theta_f2c_mod, only: init_elements_c
-    use edge_mod_base, only: initEdgeBuffer, edge_g
+    use edge_mod, only: initEdgeBuffer, edge_g
     use control_mod, only: transport_alg, semi_lagrange_cdr_alg, semi_lagrange_cdr_check, &
          semi_lagrange_hv_q, limiter_option, nu_q, hypervis_subcycle_q, hypervis_order, &
          vert_remap_q_alg, qsplit, rsplit, dt_remap_factor, dt_tracer_factor, &

components/homme/test_execs/thetal_kokkos_ut/dirk_interface.F90

@@ -11,7 +11,7 @@ subroutine init_dirk_f90(ne, hyai, hybi, hyam, hybm, ps0) bind(c)
     use hybvcoord_mod,          only: set_layer_locations
     use dimensions_mod,         only: nlev, nlevp, np
     use thetal_test_interface,  only: init_f90
-    use edge_mod_base,          only: initEdgeBuffer, edge_g
+    use edge_mod,          only: initEdgeBuffer, edge_g
     use geometry_interface_mod, only: par, elem
 
     real (kind=real_kind), intent(in) :: hyai(nlevp), hybi(nlevp), hyam(nlev), hybm(nlev)

components/homme/test_execs/thetal_kokkos_ut/gllfvremap_interface.F90

@@ -13,7 +13,7 @@ subroutine init_gllfvremap_f90(ne, hyai, hybi, hyam, hybm, ps0, dvv, mp, qsize_i
     use hybvcoord_mod, only: set_layer_locations
     use thetal_test_interface, only: init_f90, init_planar_f90
     use theta_f2c_mod, only: init_elements_c
-    use edge_mod_base, only: initEdgeBuffer, edge_g, initEdgeSBuffer
+    use edge_mod, only: initEdgeBuffer, edge_g, initEdgeSBuffer
     use prim_advection_base, only: edgeAdvQminmax
     use bndry_mod, only: sort_neighbor_buffer_mapping
     use reduction_mod, only: initreductionbuffer, red_sum, red_min, red_max

components/homme/test_execs/thetal_kokkos_ut/hv_interface.F90

@@ -19,7 +19,7 @@ subroutine init_hv_f90 (ne, hyai, hybi, hyam, hybm, dvv, mp, ps0, hv_subcycle, &
                           hv_nu, hv_nu_div, hv_nu_top, hv_nu_p, hv_nu_s) bind(c)
     use control_mod,    only: hypervis_subcycle, nu, nu_div, nu_top, nu_p, nu_s
     use thetal_test_interface, only: init_f90
-    use edge_mod_base, only: initEdgeBuffer, edge_g
+    use edge_mod, only: initEdgeBuffer, edge_g
     use element_state, only: nlev_tom, nu_scale_top
     use geometry_interface_mod, only: par, elem
     use physical_constants,     only: scale_factor, scale_factor_inv, laplacian_rigid_factor, rearth, rrearth
@@ -63,7 +63,7 @@ subroutine biharmonic_wk_theta_f90(np1, hv_scaling, hydrostatic, dp_ptr, vtheta_
                                      dptens_ptr, ttens_ptr, wtens_ptr, phitens_ptr, vtens_ptr) bind(c)
     use control_mod,            only: hypervis_scaling, theta_hydrostatic_mode
     use dimensions_mod,         only: nelemd
-    use edge_mod_base,          only: edge_g
+    use edge_mod,          only: edge_g
     use element_state,          only: timelevels
     use geometry_interface_mod, only: par,elem,hybrid
     use hybrid_mod,             only: hybrid_t, hybrid_create

components/homme/test_execs/thetal_kokkos_ut/remap_theta_interface.F90

@@ -13,7 +13,7 @@ subroutine init_remap_f90 (ne, hyai, hybi, hyam, hybm, dvv, mp, ps0) bind(c)
     use iso_c_binding,          only: c_int
     use thetal_test_interface,  only: init_f90
     use dimensions_mod,         only: nlev, nlevp, np
-    use edge_mod_base,          only: initEdgeBuffer, edge_g
+    use edge_mod,          only: initEdgeBuffer, edge_g
     use geometry_interface_mod, only: par, elem
     !
     ! Inputs

components/homme/test_execs/thetal_kokkos_ut/thetal_test_interface.F90

@@ -234,7 +234,7 @@ subroutine init_geo_views_f90 (d_ptr, dinv_ptr,        &
   end subroutine init_geo_views_f90
 
   subroutine cleanup_f90 () bind(c)
-    use edge_mod_base, only : FreeEdgeBuffer, edge_g
+    use edge_mod, only : FreeEdgeBuffer, edge_g
     use element_state, only : deallocate_element_arrays
     use geometry_interface_mod, only: cleanup_geometry_f90
     use parallel_mod, only: rrequest, srequest, status