Updates in Domain_Class

src/modules/Domain/src/Domain_Class.F90

@@ -31,6 +31,8 @@ MODULE Domain_Class
 USE ElementFactory
 USE ExceptionHandler_Class, ONLY: e
 USE HDF5File_Class
+USE tomlf, ONLY: toml_table
+USE TxtFile_Class
 IMPLICIT NONE
 PRIVATE
 CHARACTER(*), PARAMETER :: modName = "Domain_Class"
@@ -170,6 +172,12 @@ MODULE Domain_Class
   PROCEDURE, PASS(Obj) :: IMPORT => Domain_Import
   !! Initiates an instance of domain by importing data from meshfile
   !! TODO Add an export method to [[Domain_]] class
+  PROCEDURE, PASS(obj) :: ImportFromToml1 => Domain_ImportFromToml1
+  PROCEDURE, PASS(obj) :: ImportFromToml2 => Domain_ImportFromToml2
+  GENERIC, PUBLIC :: ImportFromToml => ImportFromToml1,  &
+  & ImportFromToml2
+  !! Initiates an instance of domain by importing meshfile name from
+  !! Toml file
   PROCEDURE, PUBLIC, PASS(obj) :: Display => Domain_Display
   !! TODO Add a display method to [[Domain_]] class
   PROCEDURE, PUBLIC, PASS(obj) :: DisplayMeshFacetData => &
@@ -512,6 +520,54 @@ MODULE SUBROUTINE Domain_Import(obj, hdf5, group)
   END SUBROUTINE Domain_Import
 END INTERFACE
 
+!----------------------------------------------------------------------------
+!                                                   ImportFromToml@IOMethods
+!----------------------------------------------------------------------------
+
+!> author: Shion Shimizu
+! date:   2023-12-20
+! summary:  Initiate an instance of domain by importing meshfile name from
+! Toml file
+!
+! NOTE: default meshfile name is "mesh.h5"
+! and default group in hdf5 is ""
+!
+! NOTE: meshfile (hdf5) is internally initiated and is deallocated
+! after initiation of domain
+
+INTERFACE
+  MODULE SUBROUTINE Domain_ImportFromToml1(obj, table)
+    CLASS(Domain_), INTENT(INOUT) :: obj
+    TYPE(toml_table), INTENT(INOUT) :: table
+  END SUBROUTINE Domain_ImportFromToml1
+END INTERFACE
+
+!----------------------------------------------------------------------------
+!                                                   ImportFromToml1@IOMethods
+!----------------------------------------------------------------------------
+
+!> author: Shion Shimizu
+! date:   2023-12-20
+! summary:  Initiate an instance of domain by importing meshfile name from
+! Toml file
+!
+! NOTE: default meshfile name is "mesh.h5"
+! and default group in hdf5 is ""
+!
+! NOTE: meshfile (hdf5) is internally initiated and is deallocated
+! after initiation of domain
+
+INTERFACE
+  MODULE SUBROUTINE Domain_ImportFromToml2(obj, tomlName, afile, filename,  &
+  & printToml)
+    CLASS(Domain_), INTENT(INOUT) :: obj
+    CHARACTER(*), INTENT(IN) :: tomlName
+    TYPE(TxtFile_), OPTIONAL, INTENT(INOUT) :: afile
+    CHARACTER(*), OPTIONAL, INTENT(IN) :: filename
+    LOGICAL(LGT), OPTIONAL, INTENT(IN) :: printToml
+  END SUBROUTINE Domain_ImportFromToml2
+END INTERFACE
+
 !----------------------------------------------------------------------------
 !                                                          Display@IOMethods
 !----------------------------------------------------------------------------

src/submodules/AbstractBC/src/AbstractBC_Class@IOMethods.F90

@@ -527,15 +527,7 @@
   & '[START] ImportFromToml()')
 #endif
 
-IF (PRESENT(afile)) THEN
-  CALL GetValue(table=table, afile=afile)
-ELSEIF (PRESENT(filename)) THEN
-  CALL GetValue(table=table, filename=filename)
-ELSE
-  CALL e%RaiseError(modName//'::'//myName//' - '// &
-    & '[ARG ERROR] :: either filename or afile should be present!')
-  RETURN
-END IF
+CALL GetValue(table=table, afile=afile, filename=filename)
 
 node => NULL()
 CALL toml_get(table, tomlName, node, origin=origin, requested=.FALSE.,  &

src/submodules/Domain/src/Domain_Class@IOMethods.F90

@@ -16,6 +16,10 @@
 
 SUBMODULE(Domain_Class) IOMethods
 USE BaseMethod
+USE tomlf, ONLY:  &
+  & toml_serialize,  &
+  & toml_get => get_value
+USE TomlUtility
 IMPLICIT NONE
 CONTAINS
 
@@ -495,6 +499,95 @@
 !
 END PROCEDURE Domain_Import
 
+!----------------------------------------------------------------------------
+!                                                              ImportFromToml
+!----------------------------------------------------------------------------
+
+MODULE PROCEDURE Domain_ImportFromToml1
+CHARACTER(*), PARAMETER :: myName = "Domain_ImportFromToml()"
+TYPE(HDF5File_) :: meshfile
+CHARACTER(:), ALLOCATABLE :: meshfilename, ext, group
+CHARACTER(*), PARAMETER :: default_meshfilename = "mesh.h5"
+CHARACTER(*), PARAMETER :: default_group = ""
+INTEGER(i4b) :: origin, stat
+LOGICAL(LGT) :: problem
+
+#ifdef DEBUG_VER
+CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+  & '[START] ImportFromToml()')
+#endif
+
+CALL toml_get(table, "filename", meshfilename, default_meshfilename,  &
+& origin=origin, stat=stat)
+
+ext = getExtension(meshfilename)
+problem = .NOT. ext .EQ. "h5"
+
+IF (problem) THEN
+  CALL e%RaiseError(modName//'::'//myName//' - '// &
+    & '[INTERNAL ERROR] :: given filename is not HDF5File. '//  &
+    & 'Extension should be "h5"')
+END IF
+
+CALL toml_get(table, "group", group, default_group,  &
+& origin=origin, stat=stat)
+
+CALL meshfile%Initiate(meshfilename, mode="READ")
+CALL meshfile%OPEN()
+CALL obj%IMPORT(hdf5=meshfile, group=group)
+CALL meshfile%DEALLOCATE()
+
+#ifdef DEBUG_VER
+CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+  & '[END] ImportFromToml()')
+#endif
+
+END PROCEDURE Domain_ImportFromToml1
+
+!----------------------------------------------------------------------------
+!                                                              ImportFromToml
+!----------------------------------------------------------------------------
+
+MODULE PROCEDURE Domain_ImportFromToml2
+CHARACTER(*), PARAMETER :: myName = "Domain_ImportFromToml2()"
+TYPE(toml_table), ALLOCATABLE :: table
+TYPE(toml_table), POINTER :: node
+INTEGER(I4B) :: origin, stat
+
+#ifdef DEBUG_VER
+CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+  & '[START] ImportFromToml2()')
+#endif
+
+CALL GetValue(table=table, afile=afile, filename=filename)
+
+node => NULL()
+CALL toml_get(table, tomlName, node, origin=origin, requested=.FALSE.,  &
+  & stat=stat)
+
+IF (.NOT. ASSOCIATED(node)) THEN
+  CALL e%RaiseError(modName//'::'//myName//' - '// &
+    & '[CONFIG ERROR] :: following error occured while reading '//  &
+    & 'the toml file :: cannot find '//tomlName//" table in config.")
+END IF
+
+CALL obj%ImportFromToml(table=node)
+
+#ifdef DEBUG_VER
+IF (PRESENT(printToml)) THEN
+  CALL Display(toml_serialize(node),  &
+    & "Domain toml config = "//CHAR_LF,  &
+  & unitNo=stdout)
+END IF
+#endif
+
+#ifdef DEBUG_VER
+CALL e%RaiseInformation(modName//'::'//myName//' - '// &
+  & '[END] ImportFromToml2()')
+#endif
+
+END PROCEDURE Domain_ImportFromToml2
+
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------