Merge branch 'sunt05/issue283' of github.com:UMEP-dev/SUEWS into sunt…

…05/issue283
UMEP-dev · Oct 10, 2024 · ee64e0d · ee64e0d
2 parents b2600f8 + 1234f30
commit ee64e0d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/src/suews/src/suews_ctrl_type.f95 b/src/suews/src/suews_ctrl_type.f95
@@ -261,7 +261,6 @@ MODULE SUEWS_DEF_DTS
    !    !    PROCEDURE :: DEALLOCATE => deallocate_stebbs_c
    ! END TYPE STEBBS_BUILDING_PRM
 
-
    ! ********** SUEWS_parameters schema (derived) **********
 
    TYPE, PUBLIC :: LUMPS_PRM

diff --git a/src/suews/src/suews_phys_stebbs.f95 b/src/suews/src/suews_phys_stebbs.f95
@@ -680,7 +680,7 @@ SUBROUTINE stebbsonlinecouple( &
 !
       USE modulestebbs, ONLY: nbtype, blds, cases, fnmls, resolution
       USE modulesuewsstebbscouple, ONLY: sout ! Defines sout
-      USE modulestebbsprecision!, ONLY: rprc ! Defines rprc as REAL64
+      USE modulestebbsprecision !, ONLY: rprc ! Defines rprc as REAL64
       USE allocateArray, ONLY: ncolumnsDataOutSTEBBS
 !
       USE SUEWS_DEF_DTS, ONLY: SUEWS_CONFIG, SUEWS_TIMER, SUEWS_FORCING, LC_PAVED_PRM, LC_BLDG_PRM, &
@@ -734,7 +734,7 @@ SUBROUTINE stebbsonlinecouple( &
          roughnessState => modState%roughnessState, &
          bldgState => modState%bldgState &
          )
-         
+
          ! ALLOCATE(cases(nbtype))
 
          ASSOCIATE ( &
@@ -773,33 +773,33 @@ SUBROUTINE stebbsonlinecouple( &
                command = 'ls ./BuildClasses/*.nml > file_list.txt'
                CALL EXECUTE_COMMAND_LINE(command)
 
-               OPEN(UNIT=10, FILE='file_list.txt', STATUS='old', ACTION='read', IOSTAT=ios)
+               OPEN (UNIT=10, FILE='file_list.txt', STATUS='old', ACTION='read', IOSTAT=ios)
                IF (ios /= 0) THEN
                   PRINT *, 'Error opening file_list.txt'
                   STOP
                END IF
 
                num_files = 0
                DO
-                  READ(10, '(A)', IOSTAT=ios) filename
+                  READ (10, '(A)', IOSTAT=ios) filename
                   IF (ios /= 0) EXIT
                   num_files = num_files + 1
                END DO
 
-               ALLOCATE(cases(num_files))
-               ALLOCATE(fnmls(num_files))
-               ALLOCATE(blds(num_files))
+               ALLOCATE (cases(num_files))
+               ALLOCATE (fnmls(num_files))
+               ALLOCATE (blds(num_files))
 
-               REWIND(10)
+               REWIND (10)
                DO i = 1, num_files
-                  READ(10, '(A)', IOSTAT=ios) cases(i)
+                  READ (10, '(A)', IOSTAT=ios) cases(i)
                   IF (ios /= 0) EXIT
                END DO
 
-               CLOSE(10)
+               CLOSE (10)
 
                nbtype = num_files
-         !
+               !
                WRITE (*, *) '++++ SUEWS-STEBBS coupling'
                WRITE (*, *) '    + Total building type : ', nbtype
                DO i = 1, nbtype, 1
@@ -811,7 +811,7 @@ SUBROUTINE stebbsonlinecouple( &
 
                DO i = 1, nbtype, 1
                   fnmls(i) = TRIM(cases(i))
-                  WRITE(*, *) '    + Building class file : ', TRIM(fnmls(i))
+                  WRITE (*, *) '    + Building class file : ', TRIM(fnmls(i))
                   CALL create_building(cases(i), blds(i), i) ! also changed cases here
                END DO
 !          !
@@ -838,7 +838,7 @@ SUBROUTINE stebbsonlinecouple( &
                ALLOCATE (sout%Lwall_exch(sout%ntstep))
                !
             END IF
-      
+
 ! !
 ! !
 ! !
@@ -2175,7 +2175,7 @@ SUBROUTINE readnml(fnml, self)
    CHARACTER(len=256), INTENT(in) :: fnml
 !
    CHARACTER(len=256) :: BuildingType, BuildingName
-   
+
    INTEGER :: ios
    CHARACTER(LEN=256) :: fnml_trimmed
 
@@ -2407,31 +2407,31 @@ SUBROUTINE readnml(fnml, self)
 !
    ! Trim the file name
    fnml_trimmed = TRIM(fnml)
-   
-   WRITE(*,*) "Reading namelist file: ", fnml_trimmed
+
+   WRITE (*, *) "Reading namelist file: ", fnml_trimmed
 
    ! Open the file with error handling
    OPEN (UNIT=8, FILE=fnml_trimmed, STATUS='OLD', IOSTAT=ios)
    IF (ios /= 0) THEN
-      WRITE(*,*) "Error opening file: ", fnml_trimmed, " with IOSTAT=", ios
+      WRITE (*, *) "Error opening file: ", fnml_trimmed, " with IOSTAT=", ios
       STOP 'File open error'
    END IF
 
    ! Print debug information
-   WRITE(*,*) "File opened successfully: ", fnml_trimmed, " with IOSTAT=", ios
+   WRITE (*, *) "File opened successfully: ", fnml_trimmed, " with IOSTAT=", ios
 
    ! ! Read the namelist with error handling
    READ (UNIT=8, NML=specification, IOSTAT=ios)
    IF (ios /= 0) THEN
-      WRITE(*,*) "Error reading namelist from file: ", fnml_trimmed, " with IOSTAT=", ios
+      WRITE (*, *) "Error reading namelist from file: ", fnml_trimmed, " with IOSTAT=", ios
       STOP 'Namelist read error'
    END IF
 
    ! Print debug information
-   WRITE(*,*) "Namelist read successfully from file: ", fnml_trimmed
+   WRITE (*, *) "Namelist read successfully from file: ", fnml_trimmed
 
    ! ! Close the file
-   CLOSE(UNIT=8)
+   CLOSE (UNIT=8)
 
 !
 !