EAMxx: Removing unused code.

EAMxx: Fixing compilation error in CUDA.

Author: odiazib

components/eamxx/src/physics/mam/readfiles/vertical_remapper_mam4.cpp

@@ -1,16 +1,6 @@
 #include "vertical_remapper_mam4.hpp"
-
-#include "share/grid/point_grid.hpp"
-#include "share/io/scorpio_input.hpp"
-#include "share/field/field_tag.hpp"
-#include "share/field/field_identifier.hpp"
-#include "share/util/eamxx_universal_constants.hpp"
 #include "share/io/eamxx_scorpio_interface.hpp"
-
-#include <ekat/util/ekat_units.hpp>
-#include <ekat/kokkos/ekat_kokkos_utils.hpp>
-
-#include <numeric>
+#include <mam4xx/mam4.hpp>
 
 namespace scream
 {
@@ -34,11 +24,7 @@ void VerticalRemapperMAM4::remap_fwd_impl ()
 
   }
 }
-void VerticalRemapperMAM4::
-set_source_pressure (const Field& p)
-{
-  m_src_pmid=p;
-}
+
 void VerticalRemapperMAM4::
 set_target_pressure (const Field& p)
 {
@@ -78,15 +64,15 @@ apply_vertical_interpolation(const Field& f_src, const Field& f_tgt,
 
   const auto policy =
       ekat::ExeSpaceUtils<KT::ExeSpace>::get_default_team_policy(ncols, nlevs_tgt);
-
+  using Team = Kokkos::TeamPolicy<KT::ExeSpace>::member_type;
   if (m_vremap_type== MAM4_PSRef) {
 
     const int unit_factor_pin=1;
     const auto p_src_c = p_src.get_view<const Real **>();
 
     Kokkos::parallel_for(
       "vert_interp", policy,
-      KOKKOS_LAMBDA(const ThreadTeam &team) {
+      KOKKOS_LAMBDA(const Team &team) {
         const int icol = team.league_rank();
         const auto pin_at_icol     = ekat::subview(p_src_c, icol);
         const auto pmid_at_icol    = ekat::subview(p_tgt_c, icol);
@@ -104,7 +90,7 @@ apply_vertical_interpolation(const Field& f_src, const Field& f_tgt,
 
     Kokkos::parallel_for(
       "vert_interp", policy,
-      KOKKOS_LAMBDA(const ThreadTeam &team) {
+      KOKKOS_LAMBDA(const Team &team) {
         const int icol = team.league_rank();
         const auto pmid_at_icol    = ekat::subview(p_tgt_c, icol);
         const auto datain_at_icol  = ekat::subview(datain, icol);
@@ -122,7 +108,7 @@ apply_vertical_interpolation(const Field& f_src, const Field& f_tgt,
       constexpr Real m2km    = 1e-3;
       Kokkos::parallel_for(
       "tracer_vert_interp_loop", policy,
-      KOKKOS_LAMBDA(const ThreadTeam &team) {
+      KOKKOS_LAMBDA(const Team &team) {
         const int icol = team.league_rank();
         const auto datain_at_icol  = ekat::subview(datain, icol);
         const auto dataout_at_icol = ekat::subview(dataout, icol);

components/eamxx/src/physics/mam/readfiles/vertical_remapper_mam4.hpp

@@ -1,9 +1,7 @@
 #ifndef EAMXX_VERTICAL_REMAPPER_MAM4_HPP
 #define EAMXX_VERTICAL_REMAPPER_MAM4_HPP
 
-// #include "share/grid/remap/abstract_remapper.hpp"
 #include "share/grid/remap/vertical_remapper.hpp"
-#include <mam4xx/mam4.hpp>
 
 namespace scream
 {
@@ -29,7 +27,6 @@ class VerticalRemapperMAM4 : public VerticalRemapper
 
   ~VerticalRemapperMAM4 () = default;
 
-  void set_source_pressure (const Field& p);
   void set_target_pressure (const Field& p);
   void set_source_pressure (const std::string& file_name);
 
@@ -45,16 +42,6 @@ class VerticalRemapperMAM4 : public VerticalRemapper
                                      const Field& p_src, const Field& p_tgt) const;
 
 protected:
-
-  using KT = KokkosTypes<DefaultDevice>;
-
-  template<typename T>
-  using view_1d = typename KT::template view_1d<T>;
-  template<typename T>
-  using view_2d = typename KT::template view_2d<T>;
-
-  // a thread team dispatched to a single vertical column
-  using ThreadTeam = mam4::ThreadTeam;
   VertRemapType         m_vremap_type;
 };