fix(netcdf): add all models to model inputs list (#2219)

* add all models to input models list

* naming adjustment

---------

Co-authored-by: mjreno <mjreno@IGSAAA071L01144.gs.doi.net>

Author: mjreno

src/Utilities/Export/ModelExport.f90

@@ -74,7 +74,7 @@ end function nc_export_active
   !> @brief create export container variable for all local models
   !!
   subroutine modelexports_create(iout)
-    use InputLoadTypeModule, only: model_dynamic_pkgs
+    use InputLoadTypeModule, only: model_inputs
     use MemoryManagerModule, only: mem_setptr
     use MemoryManagerExtModule, only: mem_set_value
     use MemoryHelperModule, only: create_mem_path
@@ -83,31 +83,31 @@ subroutine modelexports_create(iout)
     use NCModelExportModule, only: NETCDF_MESH2D, NETCDF_STRUCTURED
     use SourceCommonModule, only: file_ext
     integer(I4B), intent(in) :: iout
-    type(ModelDynamicPkgsType), pointer :: model_dynamic_input
+    type(ModelDynamicPkgsType), pointer :: model_input
     type(ExportModelType), pointer :: export_model
     character(len=LENMEMPATH) :: modelnam_mempath, model_mempath, ext
     integer(I4B), pointer :: disenum
     integer(I4B) :: n
     logical(LGP) :: found
 
-    do n = 1, model_dynamic_pkgs%Count()
+    do n = 1, model_inputs%Count()
       ! allocate and initialize
       allocate (export_model)
 
       ! set pointer to dynamic input model instance
-      model_dynamic_input => GetDynamicModelFromList(model_dynamic_pkgs, n)
+      model_input => GetDynamicModelFromList(model_inputs, n)
 
       ! set input mempaths
       modelnam_mempath = &
-        create_mem_path(component=model_dynamic_input%modelname, &
+        create_mem_path(component=model_input%modelname, &
                         subcomponent='NAM', context=idm_context)
-      model_mempath = create_mem_path(component=model_dynamic_input%modelname, &
+      model_mempath = create_mem_path(component=model_input%modelname, &
                                       context=idm_context)
       ! set pointer to dis enum type
       call mem_setptr(disenum, 'DISENUM', model_mempath)
 
       ! initialize model
-      call export_model%init(model_dynamic_input, disenum, iout)
+      call export_model%init(model_input, disenum, iout)
 
       ! update NetCDF fileout name if provided
       call mem_set_value(export_model%nc_fname, 'NCMESH2DFILE', &

src/Utilities/Idm/IdmLoad.f90

@@ -15,7 +15,7 @@ module IdmLoadModule
   use InputLoadTypeModule, only: StaticPkgLoadBaseType, &
                                  DynamicPkgLoadBaseType, &
                                  ModelDynamicPkgsType, &
-                                 model_dynamic_pkgs
+                                 model_inputs
   use InputDefinitionModule, only: InputParamDefinitionType
   use ModflowInputModule, only: ModflowInputType, getModflowInput
 
@@ -38,8 +38,8 @@ subroutine idm_df()
     use InputLoadTypeModule, only: GetDynamicModelFromList
     class(ModelDynamicPkgsType), pointer :: model_dynamic_input
     integer(I4B) :: n
-    do n = 1, model_dynamic_pkgs%Count()
-      model_dynamic_input => GetDynamicModelFromList(model_dynamic_pkgs, n)
+    do n = 1, model_inputs%Count()
+      model_dynamic_input => GetDynamicModelFromList(model_inputs, n)
       call model_dynamic_input%df()
     end do
   end subroutine idm_df
@@ -50,8 +50,8 @@ subroutine idm_rp()
     use InputLoadTypeModule, only: GetDynamicModelFromList
     class(ModelDynamicPkgsType), pointer :: model_dynamic_input
     integer(I4B) :: n
-    do n = 1, model_dynamic_pkgs%Count()
-      model_dynamic_input => GetDynamicModelFromList(model_dynamic_pkgs, n)
+    do n = 1, model_inputs%Count()
+      model_dynamic_input => GetDynamicModelFromList(model_inputs, n)
       call model_dynamic_input%rp()
     end do
   end subroutine idm_rp
@@ -62,8 +62,8 @@ subroutine idm_ad()
     use InputLoadTypeModule, only: GetDynamicModelFromList
     class(ModelDynamicPkgsType), pointer :: model_dynamic_input
     integer(I4B) :: n
-    do n = 1, model_dynamic_pkgs%Count()
-      model_dynamic_input => GetDynamicModelFromList(model_dynamic_pkgs, n)
+    do n = 1, model_inputs%Count()
+      model_dynamic_input => GetDynamicModelFromList(model_inputs, n)
       call model_dynamic_input%ad()
     end do
   end subroutine idm_ad
@@ -123,7 +123,7 @@ recursive subroutine input_load(component_type, subcomponent_type, modelname, &
     integer(I4B), intent(in) :: iout
     class(StaticPkgLoadBaseType), pointer :: static_loader
     class(DynamicPkgLoadBaseType), pointer :: dynamic_loader
-    class(ModelDynamicPkgsType), pointer :: dynamic_pkgs
+    class(ModelDynamicPkgsType), pointer :: dynamic_model
     integer(I4B) :: n
 
     ! create model package loader
@@ -134,14 +134,15 @@ recursive subroutine input_load(component_type, subcomponent_type, modelname, &
     ! load static input and set dynamic loader
     dynamic_loader => static_loader%load(iout)
 
+    ! set pointer to model dynamic packages list
+    dynamic_model => &
+      dynamic_models(static_loader%mf6_input%component_type, modelname, &
+                     static_loader%component_input_name, nc_vars%nc_fname, &
+                     nc_vars%ncid, iout)
+
     if (associated(dynamic_loader)) then
-      ! set pointer to model dynamic packages list
-      dynamic_pkgs => &
-        dynamic_model_pkgs(static_loader%mf6_input%component_type, modelname, &
-                           static_loader%component_input_name, nc_vars%nc_fname, &
-                           nc_vars%ncid, iout)
       ! add dynamic pkg loader to list
-      call dynamic_pkgs%add(dynamic_loader)
+      call dynamic_model%add(dynamic_loader)
     end if
 
     ! create subpackage list
@@ -460,8 +461,8 @@ end subroutine simtdis_load
 
   !> @brief retrieve list of model dynamic loaders
   !<
-  function dynamic_model_pkgs(modeltype, modelname, modelfname, nc_fname, &
-                              ncid, iout) result(model_dynamic_input)
+  function dynamic_models(modeltype, modelname, modelfname, nc_fname, &
+                          ncid, iout) result(model_dynamic_input)
     use InputLoadTypeModule, only: AddDynamicModelToList, GetDynamicModelFromList
     character(len=*), intent(in) :: modeltype
     character(len=*), intent(in) :: modelname
@@ -477,8 +478,8 @@ function dynamic_model_pkgs(modeltype, modelname, modelfname, nc_fname, &
     nullify (model_dynamic_input)
 
     ! assign model loader object if found
-    do id = 1, model_dynamic_pkgs%Count()
-      temp => GetDynamicModelFromList(model_dynamic_pkgs, id)
+    do id = 1, model_inputs%Count()
+      temp => GetDynamicModelFromList(model_inputs, id)
       if (temp%modelname == modelname) then
         model_dynamic_input => temp
         exit
@@ -490,9 +491,9 @@ function dynamic_model_pkgs(modeltype, modelname, modelfname, nc_fname, &
       allocate (model_dynamic_input)
       call model_dynamic_input%init(modeltype, modelname, modelfname, &
                                     nc_fname, ncid, iout)
-      call AddDynamicModelToList(model_dynamic_pkgs, model_dynamic_input)
+      call AddDynamicModelToList(model_inputs, model_dynamic_input)
     end if
-  end function dynamic_model_pkgs
+  end function dynamic_models
 
   !> @brief deallocate all model dynamic loader collections
   !<
@@ -502,14 +503,14 @@ subroutine dynamic_da(iout)
     integer(I4B), intent(in) :: iout
     class(ModelDynamicPkgsType), pointer :: model_dynamic_input
     integer(I4B) :: n
-    do n = 1, model_dynamic_pkgs%Count()
-      model_dynamic_input => GetDynamicModelFromList(model_dynamic_pkgs, n)
+    do n = 1, model_inputs%Count()
+      model_dynamic_input => GetDynamicModelFromList(model_inputs, n)
       call nc_close(model_dynamic_input%ncid, model_dynamic_input%nc_fname)
       call model_dynamic_input%destroy()
       deallocate (model_dynamic_input)
       nullify (model_dynamic_input)
     end do
-    call model_dynamic_pkgs%Clear()
+    call model_inputs%Clear()
   end subroutine dynamic_da
 
   !> @brief return sim input context PRINT_INPUT value

src/Utilities/Idm/InputLoadType.f90

@@ -23,7 +23,7 @@ module InputLoadTypeModule
   public :: ModelDynamicPkgsType
   public :: AddDynamicModelToList, GetDynamicModelFromList
   public :: StaticPkgLoadType, DynamicPkgLoadType
-  public :: model_dynamic_pkgs
+  public :: model_inputs
 
   !> @brief type representing package subpackage list
   type :: SubPackageListType
@@ -143,7 +143,7 @@ subroutine period_load_if(this)
     procedure :: destroy => dynamicpkgs_destroy
   end type ModelDynamicPkgsType
 
-  type(ListType) :: model_dynamic_pkgs
+  type(ListType) :: model_inputs
 
 contains