Skip to content

Commit d6ef6c6

Browse files
committed
Manual Grid wasn't even working, AUTOGRID could never be set to TRUE
1 parent acda84e commit d6ef6c6

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

src/Basement/3DBasementHT.f90

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -919,6 +919,10 @@ SUBROUTINE GetInput(RUNID,TG)
919919
CALL GetEquivSlabInfo
920920
! END IF
921921

922+
!*** GET MANUAL GRIDDING INFORMATION
923+
! Try to get manual grid, if found, AUTOGRID is set to 'FALSE'
924+
CALL GetManualGridInfo
925+
922926
!*** GET AUTOGRIDDING INFORMATION
923927
IF (.not. SameString(AUTOGRID,'FALSE'))THEN
924928
IF (.not. SameString(EquivSizing,'FALSE'))THEN
@@ -932,11 +936,6 @@ SUBROUTINE GetInput(RUNID,TG)
932936
CALL GetAutoGridInfo
933937
! print *,'passed auto grid'
934938
END IF
935-
936-
!*** GET MANUAL GRIDDING INFORMATION
937-
ELSE
938-
CALL GetManualGridInfo
939-
! print *,'passed manual grid'
940939
END IF
941940

942941
!*** INITIALIZE THE GROUND TEMPERATURE
@@ -1008,7 +1007,7 @@ SUBROUTINE GetSimParams(RUNID)
10081007
SimParams%F=.1d0
10091008
ENDIF
10101009
SimParams%IYRS =NumArray(2)
1011-
1010+
10121011
! Override with environment variable for quicker testing
10131012
CALL GET_ENVIRONMENT_VARIABLE("CI_BASEMENT_NUMYEARS", EnvVarNumYearsString, EnvVarNumYearsStringLength, EnvVarNumYearsStatus)
10141013
SELECT CASE (EnvVarNumYearsStatus)
@@ -1026,7 +1025,7 @@ SUBROUTINE GetSimParams(RUNID)
10261025
SimParams%IYRS = EnvVarNumYears
10271026
END IF
10281027
END SELECT
1029-
1028+
10301029
IF (SimParams%IYRS <= 0.d0) THEN
10311030
CALL ShowSevereError('GetSimParams: Entered "IYRS: Maximum number of yearly iterations:" '// &
10321031
'choice is not valid.'// &
@@ -1686,6 +1685,8 @@ SUBROUTINE GetManualGridInfo
16861685
!*** RETRIEVING THE DATA
16871686
NumNums=GetNumObjectsFound('ManualGrid')
16881687
IF (NumNums > 0) THEN
1688+
print *,'Using ManualGrid, disabling AutoGridding'
1689+
AUTOGRID = 'FALSE'
16891690
CALL GetObjectItem('ManualGrid',NUM,AlphArray,NumAlphas,NumArray,NumNums,IOSTAT)
16901691
NX =NumArray(1)
16911692
NY =NumArray(2)
@@ -1776,11 +1777,14 @@ SUBROUTINE GetZFACEData
17761777
INTEGER :: NumNums ! Number of elements in the numeric array
17771778
INTEGER :: IOStat ! IO Status when calling get input subroutine
17781779
CHARACTER(len=MaxNameLength),DIMENSION(1) :: AlphArray !character string data
1779-
REAL(r64),DIMENSION(-NZAG:NZBG) :: NumArray !numeric data
1780+
REAL(r64),DIMENSION(136) :: NumArray !numeric data
17801781

17811782
!*** RETRIEVING THE DATA
17821783
CALL GetObjectItem('ZFACE',NUM,AlphArray,NumAlphas,NumArray,NumNums,IOSTAT)
1783-
ZFACE=NumArray
1784+
DO COUNT1=1,NumNums
1785+
ZFACE(-NZAG+COUNT1-1)=NumArray(COUNT1)
1786+
END DO
1787+
17841788
RETURN
17851789
END SUBROUTINE GetZFACEData
17861790

0 commit comments

Comments
 (0)