Merge pull request #226 from vickysharma0812/issue212

Updates in STScalarField_Class

Author: vickysharma0812

src/modules/STScalarField/src/STScalarField_Class.F90

@@ -1031,9 +1031,10 @@ END FUNCTION stsField_GetPrefix
 ! summary: Apply Dirichlet boundary condition
 
 INTERFACE
-  MODULE SUBROUTINE stsField_ApplyDirichletBC1(obj, dbc)
+  MODULE SUBROUTINE stsField_ApplyDirichletBC1(obj, dbc, times)
     CLASS(STScalarField_), INTENT(INOUT) :: obj
     CLASS(DirichletBC_), INTENT(IN) :: dbc
+    REAL(DFP), OPTIONAL, INTENT(IN) :: times(:)
   END SUBROUTINE stsField_ApplyDirichletBC1
 END INTERFACE
 
@@ -1046,9 +1047,10 @@ END SUBROUTINE stsField_ApplyDirichletBC1
 ! summary: Apply Dirichlet boundary condition
 
 INTERFACE
-  MODULE SUBROUTINE stsField_ApplyDirichletBC2(obj, dbc)
+  MODULE SUBROUTINE stsField_ApplyDirichletBC2(obj, dbc, times)
     CLASS(STScalarField_), INTENT(INOUT) :: obj
     CLASS(DirichletBCPointer_), INTENT(IN) :: dbc(:)
+    REAL(DFP), OPTIONAL, INTENT(IN) :: times(:)
   END SUBROUTINE stsField_ApplyDirichletBC2
 END INTERFACE
 

src/submodules/STScalarField/src/[email protected]

@@ -25,92 +25,76 @@
 !----------------------------------------------------------------------------
 
 MODULE PROCEDURE stsField_applyDirichletBC1
-  CHARACTER( LEN = * ), PARAMETER :: myName = "stsField_applyDirichletBC1"
-  REAL( DFP ), ALLOCATABLE :: nodalvalue(:,:)
-  INTEGER( I4B ), ALLOCATABLE :: nodenum( : )
-  INTEGER( I4B ) :: idof
-  !!
-  !! main
-  !!
-  CALL dbc%get( nodalvalue=nodalvalue, nodenum=nodenum )
-  !!
-  IF( size( nodalvalue, 2 ) .EQ. 1 ) THEN
-    !!
-    DO idof = 1, obj%timecompo
-      CALL obj%Set( &
-        & globalNode=nodenum, &
-        & value=nodalvalue(:,1), &
-        & timecompo=idof )
-    END DO
-    !!
-  ELSE
-    !!
-    !! check
-    !!
-    IF( SIZE( nodalvalue, 2 ) .NE. obj%timeCompo ) &
-      & CALL e%raiseError(modName//'::'//myName// " - "// &
-      & 'SIZE( nodalvalue, 2 ) .NE. obj%timeCompo')
-    !!
-    CALL obj%Set( &
-      & globalNode=nodenum, &
-      & value=nodalvalue )
-    !!
+CHARACTER(*), PARAMETER :: myName = "stsField_applyDirichletBC1()"
+REAL(DFP), ALLOCATABLE :: nodalvalue(:, :)
+INTEGER(I4B), ALLOCATABLE :: nodenum(:)
+INTEGER(I4B) :: idof, aint
+
+CALL dbc%get(nodalvalue=nodalvalue, nodenum=nodenum, times=times)
+
+IF (SIZE(nodalvalue, 2) .EQ. 1) THEN
+  DO idof = 1, obj%timecompo
+    CALL obj%Set(globalNode=nodenum, VALUE=nodalvalue(:, 1),  &
+      & timecompo=idof)
+  END DO
+
+ELSE
+  aint = SIZE(nodalvalue, 2)
+  IF (SIZE(nodalvalue, 2) .NE. obj%timeCompo) THEN
+    CALL e%raiseError(modName//'::'//myName//" - "// &
+      & '[INERNAL ERROR] :: SIZE( nodalvalue, 2 ) is '//  &
+      & tostring(aint)//' which is not equal to obj%timeCompo '//  &
+      & ' which is '//tostring(obj%timeCompo))
   END IF
-  !!
-  !!
-  IF( ALLOCATED( nodalvalue ) ) DEALLOCATE( nodalvalue )
-  IF( ALLOCATED( nodenum ) ) DEALLOCATE( nodenum )
-  !!
+  CALL obj%Set(globalNode=nodenum, VALUE=nodalvalue)
+
+END IF
+
+IF (ALLOCATED(nodalvalue)) DEALLOCATE (nodalvalue)
+IF (ALLOCATED(nodenum)) DEALLOCATE (nodenum)
 END PROCEDURE stsField_applyDirichletBC1
 
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
 
 MODULE PROCEDURE stsField_applyDirichletBC2
-  CHARACTER( LEN = * ), PARAMETER :: myName = "stsField_applyDirichletBC2"
-  REAL( DFP ), ALLOCATABLE :: nodalvalue(:,:)
-  INTEGER( I4B ), ALLOCATABLE :: nodenum( : )
-  INTEGER( I4B ) :: idof, ii
-  !!
-  !! main
-  !!
-  DO ii = 1, SIZE( dbc )
-    !!
-    CALL dbc(ii)%ptr%get( nodalvalue=nodalvalue, nodenum=nodenum )
-    !!
-    IF( SIZE( nodalvalue, 2 ) .EQ. 1 ) THEN
-      !!
-      DO idof = 1, obj%timecompo
-        CALL obj%Set( &
-          & globalNode=nodenum, &
-          & value=nodalvalue(:,1), &
-          & timecompo=idof )
-      END DO
-      !!
-    ELSE
-      !!
-      !! check
-      !!
-      IF( SIZE( nodalvalue, 2 ) .NE. obj%timeCompo ) &
-        & CALL e%raiseError(modName//'::'//myName// " - "// &
-        & 'SIZE( nodalvalue, 2 ) .NE. obj%timeCompo')
-      !!
-      CALL obj%Set( &
-        & globalNode=nodenum, &
-        & value=nodalvalue )
-      !!
+CHARACTER(*), PARAMETER :: myName = "stsField_applyDirichletBC2"
+REAL(DFP), ALLOCATABLE :: nodalvalue(:, :)
+INTEGER(I4B), ALLOCATABLE :: nodenum(:)
+INTEGER(I4B) :: idof, ii, aint
+
+DO ii = 1, SIZE(dbc)
+  CALL dbc(ii)%ptr%get(nodalvalue=nodalvalue, nodenum=nodenum,  &
+    & times=times)
+
+  IF (SIZE(nodalvalue, 2) .EQ. 1) THEN
+    DO idof = 1, obj%timecompo
+      CALL obj%Set(globalNode=nodenum, VALUE=nodalvalue(:, 1),  &
+        & timecompo=idof)
+    END DO
+
+  ELSE
+
+    aint = SIZE(nodalvalue, 2)
+
+    IF (SIZE(nodalvalue, 2) .NE. obj%timeCompo) THEN
+      CALL e%raiseError(modName//'::'//myName//" - "// &
+        & '[INERNAL ERROR] :: SIZE( nodalvalue, 2 ) is '//  &
+        & tostring(aint)//' which is not equal to obj%timeCompo '//  &
+        & ' which is '//tostring(obj%timeCompo))
     END IF
-    !!
-  END DO
-  !!
-  IF( ALLOCATED( nodalvalue ) ) DEALLOCATE( nodalvalue )
-  IF( ALLOCATED( nodenum ) ) DEALLOCATE( nodenum )
-  !!
+
+    CALL obj%Set(globalNode=nodenum, VALUE=nodalvalue)
+  END IF
+END DO
+
+IF (ALLOCATED(nodalvalue)) DEALLOCATE (nodalvalue)
+IF (ALLOCATED(nodenum)) DEALLOCATE (nodenum)
 END PROCEDURE stsField_applyDirichletBC2
 
 !----------------------------------------------------------------------------
 !
 !----------------------------------------------------------------------------
 
-END SUBMODULE DBCMethods
+END SUBMODULE DBCMethods