@@ -919,6 +919,10 @@ SUBROUTINE GetInput(RUNID,TG)
919
919
CALL GetEquivSlabInfo
920
920
! END IF
921
921
922
+ !*** GET MANUAL GRIDDING INFORMATION
923
+ ! Try to get manual grid, if found, AUTOGRID is set to 'FALSE'
924
+ CALL GetManualGridInfo
925
+
922
926
!*** GET AUTOGRIDDING INFORMATION
923
927
IF (.not. SameString(AUTOGRID,'FALSE'))THEN
924
928
IF (.not. SameString(EquivSizing,'FALSE'))THEN
@@ -932,11 +936,6 @@ SUBROUTINE GetInput(RUNID,TG)
932
936
CALL GetAutoGridInfo
933
937
! print *,'passed auto grid'
934
938
END IF
935
-
936
- !*** GET MANUAL GRIDDING INFORMATION
937
- ELSE
938
- CALL GetManualGridInfo
939
- ! print *,'passed manual grid'
940
939
END IF
941
940
942
941
!*** INITIALIZE THE GROUND TEMPERATURE
@@ -1008,7 +1007,7 @@ SUBROUTINE GetSimParams(RUNID)
1008
1007
SimParams%F=.1d0
1009
1008
ENDIF
1010
1009
SimParams%IYRS =NumArray(2)
1011
-
1010
+
1012
1011
! Override with environment variable for quicker testing
1013
1012
CALL GET_ENVIRONMENT_VARIABLE("CI_BASEMENT_NUMYEARS", EnvVarNumYearsString, EnvVarNumYearsStringLength, EnvVarNumYearsStatus)
1014
1013
SELECT CASE (EnvVarNumYearsStatus)
@@ -1026,7 +1025,7 @@ SUBROUTINE GetSimParams(RUNID)
1026
1025
SimParams%IYRS = EnvVarNumYears
1027
1026
END IF
1028
1027
END SELECT
1029
-
1028
+
1030
1029
IF (SimParams%IYRS <= 0.d0) THEN
1031
1030
CALL ShowSevereError('GetSimParams: Entered "IYRS: Maximum number of yearly iterations:" '// &
1032
1031
'choice is not valid.'// &
@@ -1686,6 +1685,8 @@ SUBROUTINE GetManualGridInfo
1686
1685
!*** RETRIEVING THE DATA
1687
1686
NumNums=GetNumObjectsFound('ManualGrid')
1688
1687
IF (NumNums > 0) THEN
1688
+ print *,'Using ManualGrid, disabling AutoGridding'
1689
+ AUTOGRID = 'FALSE'
1689
1690
CALL GetObjectItem('ManualGrid',NUM,AlphArray,NumAlphas,NumArray,NumNums,IOSTAT)
1690
1691
NX =NumArray(1)
1691
1692
NY =NumArray(2)
@@ -1776,11 +1777,14 @@ SUBROUTINE GetZFACEData
1776
1777
INTEGER :: NumNums ! Number of elements in the numeric array
1777
1778
INTEGER :: IOStat ! IO Status when calling get input subroutine
1778
1779
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
1780
1781
1781
1782
!*** RETRIEVING THE DATA
1782
1783
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
+
1784
1788
RETURN
1785
1789
END SUBROUTINE GetZFACEData
1786
1790
0 commit comments