MAPL: fix vector component naming lifecycle (#4946)

* VectorClassAspect - name vector components during create()

* Update changelog for vector component naming fix

Author: pchakraborty

CHANGELOG.md

@@ -12,6 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Relaxed the comparison standard for grid_is_ok in case a grid is r4
+- Fix vector component naming lifecycle in `superstructure/generic/specs/VariableSpec.F90`
+  and `superstructure/generic/specs/VectorClassAspect.F90` by using resolved
+  `vector_component_names` when constructing `VectorClassAspect` and setting
+  component field names during create-time rather than deferring in add-to-state
+  (PR #4946).
 
 ### Added
 - Extended StatisticsGridComp to support variance of a single field.

superstructure/generic/specs/VariableSpec.F90

@@ -679,7 +679,7 @@ function make_ClassAspect(this, registry, rc) result(aspect)
          else
             basis_kind = VECTOR_BASIS_KIND_NS
          end if
-         aspect = VectorClassAspect(this%vector_component_names, &
+         aspect = VectorClassAspect(vector_component_names, &
               [ &
               FieldClassAspect(standard_name=std_name_1, fill_value=this%fill_value), &
               FieldClassAspect(standard_name=std_name_2, fill_value=this%fill_value) &

superstructure/generic/specs/VectorClassAspect.F90

@@ -155,14 +155,17 @@ subroutine allocate(this, other_aspects, rc)
       type(AspectMap), intent(in) :: other_aspects
       integer, optional, intent(out) :: rc
 
-      integer :: status
-      integer :: i
+      type(ESMF_Field), allocatable :: field
+      integer :: i, status
 
       do i = 1, NUM_COMPONENTS
          call this%component_specs(i)%create(other_aspects, _RC)
          call update_payload(this%component_specs(i), other_aspects, _RC)
          call this%component_specs(i)%allocate(other_aspects, _RC)
          call this%component_specs(i)%add_to_bundle(this%payload, _RC)
+         ! update the name of the component
+         call this%component_specs(i)%get_payload(field=field, _RC)
+         call ESMF_FieldSet(field, name=trim(this%short_names%at(i)), _RC)
       end do
 
       _RETURN(ESMF_SUCCESS)
@@ -338,13 +341,6 @@ subroutine add_to_state(this, multi_state, actual_pt, rc)
       end if
       call ESMF_StateAddReplace(substate, [alias], _RC)
 
-      ! Also update the names of the components
-      call MAPL_FieldBundleGet(this%payload, fieldList=field_list, _RC)
-      if (size(field_list) > 0) then ! might be empty if import item
-         call ESMF_FieldSet(field_list(1), name=trim(this%short_names%at(1)), _RC)
-         call ESMF_FieldSet(field_list(2), name=trim(this%short_names%at(2)), _RC)
-      end if
-
       _RETURN(_SUCCESS)
    end subroutine add_to_state