refactor(memorystore) Rename all references to the memorylist to memorystore (#1876)

Manangka · web-flow · commit d9f4c25c1004 · 2024-06-19T09:48:51.000+02:00
In PR #1701 the MemoryList type has been renamed to MemoryStore. This commit contains some cleanup actions. It renames all references to the memorylist to memorystore. It doesn't contain any functional changes.
diff --git a/src/Distributed/MappedMemory.f90 b/src/Distributed/MappedMemory.f90
@@ -2,7 +2,7 @@ module MappedMemoryModule
   use KindModule, only: I4B, LGP
   use ConstantsModule, only: LENMEMPATH, LENVARNAME
   use MemoryTypeModule, only: MemoryType
-  use MemoryManagerModule, only: get_from_memorylist
+  use MemoryManagerModule, only: get_from_memorystore
 
   implicit none
   private
@@ -48,8 +48,8 @@ subroutine sync(this)
 
     if (.not. associated(this%src)) then
       ! cache
-      call get_from_memorylist(this%src_name, this%src_path, this%src, found)
-      call get_from_memorylist(this%tgt_name, this%tgt_path, this%tgt, found)
+      call get_from_memorystore(this%src_name, this%src_path, this%src, found)
+      call get_from_memorystore(this%tgt_name, this%tgt_path, this%tgt, found)
     end if
 
     if (this%skip_sync()) return
diff --git a/src/Distributed/VirtualBase.f90 b/src/Distributed/VirtualBase.f90
@@ -4,7 +4,7 @@ module VirtualBaseModule
   use ConstantsModule, only: LENVARNAME, LENMEMPATH, LENCOMPONENTNAME
   use MemoryTypeModule, only: MemoryType
   use MemoryManagerModule, only: mem_allocate, mem_deallocate, &
-                                 get_from_memorylist
+                                 get_from_memorystore
   implicit none
   private
 
@@ -145,8 +145,8 @@ subroutine vm_link(this)
     ! local
     logical(LGP) :: found
 
-    call get_from_memorylist(this%var_name, this%mem_path, &
-                             this%virtual_mt, found)
+    call get_from_memorystore(this%var_name, this%mem_path, &
+                              this%virtual_mt, found)
 
   end subroutine vm_link
 
diff --git a/src/Distributed/VirtualDataContainer.f90 b/src/Distributed/VirtualDataContainer.f90
@@ -6,7 +6,7 @@ module VirtualDataContainerModule
   use STLVecIntModule
   use ConstantsModule, only: LENCOMPONENTNAME, LENMEMPATH, LENCONTEXTNAME
   use MemoryHelperModule, only: create_mem_path
-  use MemoryManagerModule, only: get_from_memorylist
+  use MemoryManagerModule, only: get_from_memorystore
   implicit none
   private
 
@@ -268,7 +268,7 @@ subroutine map_internal(this, vd, shape, stages)
       ! create new virtual memory item
       vm_pth = this%get_vrt_mem_path(vd%var_name, vd%subcmp_name)
       call vd%vm_allocate(vd%var_name, vm_pth, shape)
-      call get_from_memorylist(vd%var_name, vm_pth, vd%virtual_mt, found)
+      call get_from_memorystore(vd%var_name, vm_pth, vd%virtual_mt, found)
       if (vd%map_type > 0) then
         vd%remote_to_virtual => this%element_luts(vd%map_type)%remote_to_virtual
         vd%remote_elem_shift => this%element_maps(vd%map_type)%remote_elem_shift
diff --git a/src/Model/Discretization/Dis.f90 b/src/Model/Discretization/Dis.f90
@@ -12,7 +12,7 @@ module DisModule
                        store_error_filename
   use SimVariablesModule, only: errmsg, idm_context
   use MemoryManagerModule, only: mem_allocate, mem_deallocate
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use TdisModule, only: kstp, kper, pertim, totim, delt
 
   implicit none
@@ -155,7 +155,7 @@ subroutine dis3d_da(this)
     class(DisType) :: this
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DIS', idm_context)
+    call memorystore_remove(this%name_model, 'DIS', idm_context)
     !
     ! -- DisBaseType deallocate
     call this%DisBaseType%dis_da()
diff --git a/src/Model/Discretization/Dis2d.f90 b/src/Model/Discretization/Dis2d.f90
@@ -12,7 +12,7 @@ module Dis2dModule
                        store_error_filename
   use SimVariablesModule, only: errmsg, idm_context
   use MemoryManagerModule, only: mem_allocate, mem_deallocate
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use TdisModule, only: kstp, kper, pertim, totim, delt
 
   implicit none
@@ -151,7 +151,7 @@ subroutine dis3d_da(this)
     class(Dis2dType) :: this
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DIS2D', idm_context)
+    call memorystore_remove(this%name_model, 'DIS2D', idm_context)
     !
     ! -- DisBaseType deallocate
     call this%DisBaseType%dis_da()
diff --git a/src/Model/Discretization/Disu.f90 b/src/Model/Discretization/Disu.f90
@@ -13,7 +13,7 @@ module DisuModule
   use BaseDisModule, only: DisBaseType
   use MemoryManagerModule, only: mem_allocate, mem_deallocate, &
                                  mem_reallocate, mem_setptr
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use TdisModule, only: kstp, kper, pertim, totim, delt
   use DisvGeom, only: line_unit_vector
 
@@ -433,9 +433,9 @@ subroutine disu_da(this)
     class(DisuType) :: this
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DISU', idm_context)
-    call memorylist_remove(component=this%name_model, &
-                           context=idm_context)
+    call memorystore_remove(this%name_model, 'DISU', idm_context)
+    call memorystore_remove(component=this%name_model, &
+                            context=idm_context)
     !
     ! -- scalars
     call mem_deallocate(this%njausr)
diff --git a/src/Model/Discretization/Disv.f90 b/src/Model/Discretization/Disv.f90
@@ -13,7 +13,7 @@ module DisvModule
   use SimVariablesModule, only: errmsg, idm_context
   use DisvGeom, only: DisvGeomType, line_unit_vector
   use MemoryManagerModule, only: mem_allocate, mem_deallocate, mem_setptr
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use TdisModule, only: kstp, kper, pertim, totim, delt
 
   implicit none
@@ -171,9 +171,9 @@ subroutine disv_da(this)
     class(DisvType) :: this
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DISV', idm_context)
-    call memorylist_remove(component=this%name_model, &
-                           context=idm_context)
+    call memorystore_remove(this%name_model, 'DISV', idm_context)
+    call memorystore_remove(component=this%name_model, &
+                            context=idm_context)
     !
     ! -- DisBaseType deallocate
     call this%DisBaseType%dis_da()
diff --git a/src/Model/Discretization/Disv1d.f90 b/src/Model/Discretization/Disv1d.f90
@@ -1095,15 +1095,15 @@ end function nodeu_from_string
   subroutine disv1d_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(Disv1dType) :: this
     ! -- local
     logical(LGP) :: deallocate_vertices
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DISV1D', idm_context)
+    call memorystore_remove(this%name_model, 'DISV1D', idm_context)
     !
     ! -- scalars
     deallocate_vertices = (this%nvert > 0)
diff --git a/src/Model/Discretization/Disv2d.f90 b/src/Model/Discretization/Disv2d.f90
@@ -13,7 +13,7 @@ module Disv2dModule
   use SimVariablesModule, only: errmsg, idm_context
   use DisvGeom, only: DisvGeomType, line_unit_vector
   use MemoryManagerModule, only: mem_allocate, mem_deallocate, mem_setptr
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use TdisModule, only: kstp, kper, pertim, totim, delt
 
   implicit none
@@ -152,14 +152,14 @@ end subroutine disv2d_df
   subroutine disv2d_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(Disv2dType) :: this
     ! -- local
 
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name_model, 'DISV2D', idm_context)
+    call memorystore_remove(this%name_model, 'DISV2D', idm_context)
 
     ! -- scalars
     call mem_deallocate(this%nvert)
@@ -190,8 +190,8 @@ end subroutine disv2d_da
   !   class(Disv2dType) :: this
   !   !
   !   ! -- Deallocate idm memory
-  !   call memorylist_remove(this%name_model, 'DISV', idm_context)
-  !   call memorylist_remove(component=this%name_model, &
+  !   call memorystore_remove(this%name_model, 'DISV', idm_context)
+  !   call memorystore_remove(component=this%name_model, &
   !                          context=idm_context)
   !   !
   !   ! -- DisBaseType deallocate
diff --git a/src/Model/GroundWaterEnergy/gwe-cnd.f90 b/src/Model/GroundWaterEnergy/gwe-cnd.f90
@@ -459,14 +459,14 @@ end subroutine allocate_arrays
   subroutine cnd_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GweCndType) :: this
     ! -- local
     !
     ! -- Deallocate input memory
-    call memorylist_remove(this%name_model, 'CND', idm_context)
+    call memorystore_remove(this%name_model, 'CND', idm_context)
     !
     ! -- deallocate arrays
     if (this%inunit /= 0) then
diff --git a/src/Model/GroundWaterEnergy/gwe.f90 b/src/Model/GroundWaterEnergy/gwe.f90
@@ -606,7 +606,7 @@ end subroutine gwe_ot
   subroutine gwe_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GweModelType) :: this
@@ -615,8 +615,8 @@ subroutine gwe_da(this)
     class(BndType), pointer :: packobj
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name, 'NAM', idm_context)
-    call memorylist_remove(component=this%name, context=idm_context)
+    call memorystore_remove(this%name, 'NAM', idm_context)
+    call memorystore_remove(component=this%name, context=idm_context)
     !
     ! -- Internal flow packages deallocate
     call this%dis%dis_da()
diff --git a/src/Model/GroundWaterFlow/gwf-ic.f90 b/src/Model/GroundWaterFlow/gwf-ic.f90
@@ -104,13 +104,13 @@ end subroutine ic_ar
   subroutine ic_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwfIcType) :: this
     !
     ! -- deallocate IDM memory
-    call memorylist_remove(this%name_model, 'IC', idm_context)
+    call memorystore_remove(this%name_model, 'IC', idm_context)
     !
     ! -- deallocate arrays
     call mem_deallocate(this%strt)
diff --git a/src/Model/GroundWaterFlow/gwf-npf.f90 b/src/Model/GroundWaterFlow/gwf-npf.f90
@@ -974,13 +974,13 @@ end subroutine npf_print_model_flows
   !<
   subroutine npf_da(this)
     ! -- modules
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwfNpftype) :: this
     !
     ! -- Deallocate input memory
-    call memorylist_remove(this%name_model, 'NPF', idm_context)
+    call memorystore_remove(this%name_model, 'NPF', idm_context)
     !
     ! -- TVK
     if (this%intvk /= 0) then
diff --git a/src/Model/GroundWaterFlow/gwf.f90 b/src/Model/GroundWaterFlow/gwf.f90
@@ -1082,7 +1082,7 @@ end subroutine gwf_fp
   subroutine gwf_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwfModelType) :: this
@@ -1091,8 +1091,8 @@ subroutine gwf_da(this)
     class(BndType), pointer :: packobj
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name, 'NAM', idm_context)
-    call memorylist_remove(component=this%name, context=idm_context)
+    call memorystore_remove(this%name, 'NAM', idm_context)
+    call memorystore_remove(component=this%name, context=idm_context)
     !
     ! -- Internal flow packages deallocate
     call this%dis%dis_da()
diff --git a/src/Model/GroundWaterTransport/gwt-dsp.f90 b/src/Model/GroundWaterTransport/gwt-dsp.f90
@@ -448,14 +448,14 @@ end subroutine allocate_arrays
   subroutine dsp_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwtDspType) :: this
     ! -- local
     !
     ! -- Deallocate input memory
-    call memorylist_remove(this%name_model, 'DSP', idm_context)
+    call memorystore_remove(this%name_model, 'DSP', idm_context)
     !
     ! -- deallocate arrays
     if (this%inunit /= 0) then
diff --git a/src/Model/GroundWaterTransport/gwt.f90 b/src/Model/GroundWaterTransport/gwt.f90
@@ -612,7 +612,7 @@ end subroutine gwt_ot
   subroutine gwt_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(GwtModelType) :: this
@@ -621,8 +621,8 @@ subroutine gwt_da(this)
     class(BndType), pointer :: packobj
     !
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name, 'NAM', idm_context)
-    call memorylist_remove(component=this%name, context=idm_context)
+    call memorystore_remove(this%name, 'NAM', idm_context)
+    call memorystore_remove(component=this%name, context=idm_context)
     !
     ! -- Internal flow packages deallocate
     call this%dis%dis_da()
diff --git a/src/Model/ParticleTracking/prt-mip.f90 b/src/Model/ParticleTracking/prt-mip.f90
@@ -6,7 +6,7 @@ module PrtMipModule
   use BlockParserModule, only: BlockParserType
   use BaseDisModule, only: DisBaseType
   use MemoryManagerModule, only: mem_allocate, mem_deallocate
-  use MemoryManagerExtModule, only: mem_set_value, memorylist_remove
+  use MemoryManagerExtModule, only: mem_set_value, memorystore_remove
   use SimVariablesModule, only: idm_context
   use SimModule, only: store_error
   use PrtMipInputModule, only: PrtMipParamFoundType
@@ -70,7 +70,7 @@ subroutine mip_da(this)
     class(PrtMipType) :: this
     !
     ! -- Deallocate input memory
-    call memorylist_remove(this%name_model, 'MIP', idm_context)
+    call memorystore_remove(this%name_model, 'MIP', idm_context)
     !
     ! -- Deallocate parent package
     call this%NumericalPackageType%da()
diff --git a/src/Model/ParticleTracking/prt.f90 b/src/Model/ParticleTracking/prt.f90
@@ -687,7 +687,7 @@ end subroutine prt_ot_bdsummary
   subroutine prt_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     use MethodPoolModule, only: destroy_method_pool
     use MethodCellPoolModule, only: destroy_method_cell_pool
@@ -699,8 +699,8 @@ subroutine prt_da(this)
     class(BndType), pointer :: packobj
 
     ! -- Deallocate idm memory
-    call memorylist_remove(this%name, 'NAM', idm_context)
-    call memorylist_remove(component=this%name, context=idm_context)
+    call memorystore_remove(this%name, 'NAM', idm_context)
+    call memorystore_remove(component=this%name, context=idm_context)
 
     ! -- Internal packages
     call this%dis%dis_da()
diff --git a/src/Model/SurfaceWaterFlow/swf-cxs.f90 b/src/Model/SurfaceWaterFlow/swf-cxs.f90
@@ -528,13 +528,13 @@ end subroutine write_cxs_table
   subroutine cxs_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(SwfCxsType) :: this
     !
     ! -- Deallocate input memory
-    call memorylist_remove(this%name_model, 'CXS', idm_context)
+    call memorystore_remove(this%name_model, 'CXS', idm_context)
     !
     ! -- Scalars
     call mem_deallocate(this%nsections)
diff --git a/src/Model/SurfaceWaterFlow/swf-dfw.f90 b/src/Model/SurfaceWaterFlow/swf-dfw.f90
@@ -1262,13 +1262,13 @@ end subroutine dfw_print_model_flows
   subroutine dfw_da(this)
     ! -- modules
     use MemoryManagerModule, only: mem_deallocate
-    use MemoryManagerExtModule, only: memorylist_remove
+    use MemoryManagerExtModule, only: memorystore_remove
     use SimVariablesModule, only: idm_context
     ! -- dummy
     class(SwfDfwType) :: this
     !
     ! Deallocate input memory
-    call memorylist_remove(this%name_model, 'DFW', idm_context)
+    call memorystore_remove(this%name_model, 'DFW', idm_context)
 
     ! Deallocate arrays
     call mem_deallocate(this%manningsn)
diff --git a/src/Model/SurfaceWaterFlow/swf-ic.f90 b/src/Model/SurfaceWaterFlow/swf-ic.f90
diff --git a/src/Model/SurfaceWaterFlow/swf.f90 b/src/Model/SurfaceWaterFlow/swf.f90
diff --git a/src/Utilities/Idm/IdmLoad.f90 b/src/Utilities/Idm/IdmLoad.f90
diff --git a/src/Utilities/Idm/InputLoadType.f90 b/src/Utilities/Idm/InputLoadType.f90
diff --git a/src/Utilities/Idm/mf6blockfile/LoadMf6File.f90 b/src/Utilities/Idm/mf6blockfile/LoadMf6File.f90
diff --git a/src/Utilities/Memory/MemoryManager.f90 b/src/Utilities/Memory/MemoryManager.f90
diff --git a/src/Utilities/Memory/MemoryManagerExt.f90 b/src/Utilities/Memory/MemoryManagerExt.f90
diff --git a/src/Utilities/Memory/MemorySetHandler.f90 b/src/Utilities/Memory/MemorySetHandler.f90
diff --git a/srcbmi/mf6bmi.f90 b/srcbmi/mf6bmi.f90
diff --git a/srcbmi/mf6bmiUtil.f90 b/srcbmi/mf6bmiUtil.f90
