Working towards compilation with submodules

This commit is contained in:
Jorge Gonzalez 2026-02-09 13:52:52 +01:00
commit 58e2fa7566
17 changed files with 1125 additions and 1008 deletions

View file

@ -8,7 +8,6 @@ MODULE moduleInput
SUBROUTINE readConfig(inputFile)
USE json_module
USE moduleErrors
USE moduleBoundary
USE moduleOutput
USE moduleMesh
IMPLICIT NONE
@ -793,7 +792,7 @@ MODULE moduleInput
!Reads boundary conditions for the mesh
SUBROUTINE readBoundary(config)
USE moduleBoundary
use moduleMesh
USE moduleErrors
USE moduleSpecies
USE moduleRefParam
@ -817,22 +816,22 @@ MODULE moduleInput
INTEGER:: nTypes
CALL config%info('boundary', found, n_children = nBoundary)
ALLOCATE(boundary(1:nBoundary))
ALLOCATE(boundaries(1:nBoundary))
DO i = 1, nBoundary
WRITE(iString, '(i2)') i
object = 'boundary(' // TRIM(iString) // ')'
boundary(i)%n = i
CALL config%get(object // '.name', boundary(i)%name, found)
CALL config%get(object // '.physicalSurface', boundary(i)%physicalSurface, found)
boundaries(i)%n = i
CALL config%get(object // '.name', boundaries(i)%name, found)
CALL config%get(object // '.physicalSurface', boundaries(i)%physicalSurface, found)
CALL config%info(object // '.bTypes', found, n_children = nTypes)
IF (nTypes /= nSpecies) CALL criticalError('Not enough boundary types defined in ' // object, 'readBoundary')
ALLOCATE(boundary(i)%bTypes(1:nSpecies))
ALLOCATE(boundaries(i)%bTypes(1:nSpecies))
DO s = 1, nSpecies
WRITE(sString,'(i2)') s
object = 'boundary(' // TRIM(iString) // ').bTypes(' // TRIM(sString) // ')'
CALL config%get(object // '.type', bType, found)
associate(bound => boundary(i)%bTypes(s)%obj)
associate(bound => boundaries(i)%bTypes(s)%obj)
SELECT CASE(bType)
CASE('reflection')
ALLOCATE(boundaryReflection:: bound)