Merge pull request #3271 from GEOS-ESM/feature/tclune/#3267-refactor-…

…variable-spec

Fixes #3267 refactor variable spec

esmf_utils/UngriddedDims.F90

@@ -17,7 +17,6 @@ module mapl3g_UngriddedDims
 
    public :: UngriddedDims
    public :: make_UngriddedDims
-   public :: mirror_ungridded_dims
    public :: operator(==)
    public :: operator(/=)
 
@@ -52,14 +51,6 @@ module mapl3g_UngriddedDims
 
 contains
 
-   function mirror_ungridded_dims() result(spec)
-      type(UngriddedDims) :: spec
-
-      spec%dim_specs = UngriddedDimVector()
-      spec%is_mirror = .true.
-
-   end function mirror_ungridded_dims
-
    function new_UngriddedDims_empty() result(spec)
       type(UngriddedDims) :: spec
 

generic3g/ComponentSpecParser/parse_var_specs.F90

@@ -99,7 +99,6 @@ subroutine parse_state_specs(var_specs, hconfig, state_intent, rc)
             dependencies = to_dependencies(attributes, _RC)
 
             esmf_state_intent = to_esmf_state_intent(state_intent)
-
             var_spec = VariableSpec(esmf_state_intent, short_name=short_name, &
                  itemtype=itemtype, &
                  service_items=service_items, &
@@ -115,7 +114,6 @@ subroutine parse_state_specs(var_specs, hconfig, state_intent, rc)
             if (allocated(units)) deallocate(units)
             if (allocated(standard_name)) deallocate(standard_name)
             if (allocated(accumulation_type)) deallocate(accumulation_type)
-
             call var_specs%push_back(var_spec)
 
             call ESMF_HConfigDestroy(attributes, _RC)

generic3g/actions/CopyAction.F90

@@ -20,33 +20,23 @@ module mapl3g_CopyAction
    end type CopyAction
 
    interface CopyAction
-      module procedure new_CopyAction
-      module procedure new_CopyAction2
+       module procedure new_CopyAction
    end interface CopyAction
 
 contains
 
-   function new_CopyAction(f_in, f_out) result(action)
-      type(CopyAction) :: action
-      type(ESMF_Field), intent(in) :: f_in
-      type(ESMF_Field), intent(in) :: f_out
-
-      action%f_in = f_in
-      action%f_out = f_out
-   end function new_CopyAction
-
    ! We don't really need to know the typekind as the low level conversion routines
    ! will accept whatever is handed. So these arguments are more to preserve
    ! a consistent form for constructions across Action subclasses.
-   function new_CopyAction2(src_typekind, dst_typekind) result(action)
+   function new_CopyAction(src_typekind, dst_typekind) result(action)
       type(CopyAction) :: action
       type(ESMF_Typekind_Flag), intent(in) :: src_typekind
       type(ESMF_Typekind_Flag), intent(in) :: dst_typekind
 
       action%src_typekind = src_typekind
       action%dst_typekind = dst_typekind
 
-   end function new_CopyAction2
+   end function new_CopyAction
 
    subroutine initialize(this, importState, exportState, clock, rc)
       use esmf

generic3g/registry/StateItemExtension.F90

@@ -145,7 +145,7 @@ recursive function make_extension(this, goal, rc) result(extension)
          aspect_name => aspect_names%of(i)
          src_aspect => new_spec%get_aspect(aspect_name, _RC)
          dst_aspect => goal%get_aspect(aspect_name, _RC)
-         _ASSERT(src_aspect%can_connect_to(dst_aspect), 'cannoct connect aspect ' // aspect_name)
+         _ASSERT(src_aspect%can_connect_to(dst_aspect), 'cannot connect aspect ' // aspect_name)
 
          if (src_aspect%needs_extension_for(dst_aspect)) then
             allocate(action, source=src_aspect%make_action(dst_aspect, rc=status))

generic3g/specs/AspectCollection.F90

@@ -5,6 +5,9 @@ module mapl3g_AspectCollection
 
    use mapl3g_GeomAspect
    use mapl3g_UnitsAspect
+   use mapl3g_TypekindAspect
+
+   use mapl3g_UngriddedDimsAspect
 
    use mapl_KeywordEnforcer
    use mapl_ErrorHandling
@@ -17,15 +20,24 @@ module mapl3g_AspectCollection
       private
       type(GeomAspect), allocatable :: geom_aspect
       type(UnitsAspect), allocatable :: units_aspect
+      type(TypekindAspect), allocatable :: typekind_aspect
+      type(UngriddedDimsAspect), allocatable :: ungridded_dims_aspect
    contains
       procedure :: get_aspect ! polymorphic
       procedure :: has_aspect ! polymorphic
       procedure :: set_aspect ! polymorphic
 
       procedure :: get_geom_aspect
       procedure :: set_geom_aspect
+
       procedure :: get_units_aspect
       procedure :: set_units_aspect
+
+      procedure :: get_typekind_aspect
+      procedure :: set_typekind_aspect
+
+      procedure :: get_ungridded_dims_aspect
+      procedure :: set_ungridded_dims_aspect
 
    end type AspectCollection
 
@@ -61,6 +73,10 @@ function get_aspect(this, name, rc) result(aspect)
          aspect => this%get_geom_aspect()
       case ('UNITS')
          aspect => this%get_units_aspect()
+      case ('TYPEKIND')
+         aspect => this%get_typekind_aspect()
+      case ('UNGRIDDED_DIMS')
+         aspect => this%get_ungridded_dims_aspect()
       case default
          _FAIL('unknown aspect type: '//name)
       end select
@@ -73,7 +89,7 @@ logical function has_aspect(this, name)
       character(*), intent(in) :: name
 
       select case (name)
-      case ('GEOM', 'UNITS')
+      case ('GEOM', 'UNITS', 'UNGRIDDED_DIMS')
          has_aspect = .true.
       case default
          has_aspect = .false.
@@ -93,6 +109,10 @@ subroutine set_aspect(this, aspect, rc)
          this%geom_aspect = aspect
       type is (UnitsAspect)
          this%units_aspect = aspect
+      type is (TypekindAspect)
+         this%typekind_aspect = aspect
+      type is (UngriddedDimsAspect)
+         this%ungridded_dims_aspect = aspect
       class default
          _FAIL('unsupported aspect type: ')
       end select
@@ -130,5 +150,36 @@ subroutine set_units_aspect(this, units_aspect)
       this%units_aspect = units_aspect
    end subroutine set_units_aspect
 
+   function get_typekind_aspect(this) result(typekind_aspect)
+      type(TypekindAspect), pointer :: typekind_aspect
+      class(AspectCollection), target, intent(in) :: this
+
+      typekind_aspect => null()
+      if (allocated(this%typekind_aspect)) then
+         typekind_aspect => this%typekind_aspect
+      end if
+   end function get_typekind_aspect
+
+   subroutine set_typekind_aspect(this, typekind_aspect)
+      class(AspectCollection), intent(inout) :: this
+      type(TypekindAspect), intent(in) :: typekind_aspect
+      this%typekind_aspect = typekind_aspect
+   end subroutine set_typekind_aspect
+
+   function get_ungridded_dims_aspect(this) result(ungridded_dims_aspect)
+      type(UngriddedDimsAspect), pointer :: ungridded_dims_aspect
+      class(AspectCollection), target, intent(in) :: this
+      ungridded_dims_aspect => null()
+      if (allocated(this%ungridded_dims_aspect)) then
+         ungridded_dims_aspect => this%ungridded_dims_aspect
+      end if
+   end function get_ungridded_dims_aspect
+
+   subroutine set_ungridded_dims_aspect(this, ungridded_dims_aspect)
+      class(AspectCollection), intent(inout) :: this
+      type(UngriddedDimsAspect), intent(in) :: ungridded_dims_aspect
+      this%ungridded_dims_aspect = ungridded_dims_aspect
+   end subroutine set_ungridded_dims_aspect
+
 end module mapl3g_AspectCollection
 

generic3g/specs/CMakeLists.txt

@@ -2,6 +2,7 @@ target_sources(MAPL.generic3g PRIVATE
   StateItemAspect.F90
   AspectCollection.F90
   GeomAspect.F90
+  TypekindAspect.F90
   UngriddedDimsAspect.F90
   UnitsAspect.F90