Update namelist variable and add more outputs (#42)

TEB-model · Jul 14, 2021 · ec16708 · ec16708
1 parent c3a77bb
commit ec16708
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/docs/namelist-options.md b/docs/namelist-options.md
@@ -123,7 +123,7 @@ List of options currently available in TEB.
 | `ZROUGH_WALL`   | -               | -               | Wall roughness coeff. (`DOE-2`)                                                                      | `1.52`     |
 | `ZT_ROAD`       | -               | K               | Initial road layers temperatures (`NROAD_LAYER`)                                                     | `274.`     |
 | `ZT_ROOF`       | -               | K               | Initial roof layers temperatures (`NROOF_LAYER`)                                                     | `274.`     |
-| `ZT_WALL_A`     | -               | K               | Initial wall layers temperatures (`NWALL_LAYER`)                                                     | `274.`     |
+| `ZT_WALL`     | -               | K               | Initial wall layers temperatures (`NWALL_LAYER`)                                                     | `274.`     |
 | `ZT_FLOOR`      | -               | K               | Initial building floor layers temperatures (`NFLOOR_LAYER`)                                          | `274.`     |
 | `ZT_MASS`       | -               | K               | Initial building mass layers temperatures (`NFLOOR_LAYER`)                                           | `274.`     |
 | `ZTI_BLD`       | -               | K               | Initial indoor air temperature                                                                       | `292.15`   |

diff --git a/examples/CAPITOUL/input.nml b/examples/CAPITOUL/input.nml
@@ -326,11 +326,11 @@ ZT_ROOF(:,2) = 276.95065  ! roof layers temperatures
 ZT_ROOF(:,3) = 283.57500  ! roof layers temperatures
 ZT_ROOF(:,4) = 289.55152  ! roof layers temperatures
 ZT_ROOF(:,5) = 292.12402  ! roof layers temperatures
-ZT_WALL_A(:,1) = 274.09930  ! wall layers temperatures
-ZT_WALL_A(:,2) = 276.95065  ! wall layers temperatures
-ZT_WALL_A(:,3) = 283.57500  ! wall layers temperatures
-ZT_WALL_A(:,4) = 289.55152  ! wall layers temperatures
-ZT_WALL_A(:,5) = 292.12402  ! wall layers temperatures
+ZT_WALL(:,1) = 274.09930  ! wall layers temperatures
+ZT_WALL(:,2) = 276.95065  ! wall layers temperatures
+ZT_WALL(:,3) = 283.57500  ! wall layers temperatures
+ZT_WALL(:,4) = 289.55152  ! wall layers temperatures
+ZT_WALL(:,5) = 292.12402  ! wall layers temperatures
 ZT_FLOOR(:,1) = 292.12     ! building floor temperature
 ZT_FLOOR(:,2) = 291.89778  ! building floor temperature
 ZT_FLOOR(:,3) = 291.26111  ! building floor temperature

diff --git a/src/driver/driver.F90 b/src/driver/driver.F90
@@ -127,7 +127,7 @@ PROGRAM DRIVER
                         ZQIN_FRAD, ZQIN_FLAT, ZGR, ZSHGC, PU_WIN, ZSHADE, ZSHGC_SH ,&
                         ZNATVENT, ZV_VENT, ZF_WATER_COND, ZF_WASTE_CAN, ZTCOOL_TARGET, ZTHEAT_TARGET ,&
                         ZHR_TARGET, ZEFF_HEAT, ZCAP_SYS_HEAT, ZCAP_SYS_RAT, ZT_ADP, ZM_SYS_RAT ,&
-                        ZCOP_RAT, CCH_BEM, ZROUGH_ROOF, ZROUGH_WALL, ZT_ROAD, ZT_ROOF, ZT_WALL_A ,&
+                        ZCOP_RAT, CCH_BEM, ZROUGH_ROOF, ZROUGH_WALL, ZT_ROAD, ZT_ROOF, ZT_WALL ,&
                         ZT_FLOOR, ZT_MASS, ZTI_BLD, ZT_CANYON, ZT_WIN1, ZT_WIN2, ZQ_CANYON, ZQI_BLD, &
                         VEG_ALB, VEG_EMIS, GARDEN_BR, GREENROOF_BR
 
@@ -180,7 +180,7 @@ PROGRAM DRIVER
 REAL,DIMENSION(:,:), ALLOCATABLE :: ZD_ROAD  ! Thickness            of road layers    ! ||   ||
 REAL,DIMENSION(:,:), ALLOCATABLE :: ZT_ROAD  ! road layers temperatures               ! || F ||
 REAL,DIMENSION(:,:), ALLOCATABLE :: ZT_ROOF  ! roof layers temperatures               ! || O ||
-REAL,DIMENSION(:,:), ALLOCATABLE :: ZT_WALL_A! wall layers temperatures (wall 'A')    ! || R ||
+REAL,DIMENSION(:,:), ALLOCATABLE :: ZT_WALL! wall layers temperatures (wall 'A')    ! || R ||
 REAL,DIMENSION(:,:), ALLOCATABLE :: ZT_WALL_B! wall layers temperatures (wall 'B')    ! ||   ||
 REAL,DIMENSION(1)  :: ZROAD_DIR         ! road direction (° from North, clockwise)    ! || U ||
 REAL,DIMENSION(1)  :: ZFRAC_GR          ! fraction of greenroofs on roofs             ! || R ||
@@ -562,9 +562,12 @@ PROGRAM DRIVER
 CHARACTER(LEN=*), PARAMETER       :: T_ROOF1 = 'output/T_ROOF1.txt'                   ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: T_CANYON = 'output/T_CANYON.txt'                 ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: T_ROAD1 = 'output/T_ROAD1.txt'                   ! ||   ||
+CHARACTER(LEN=*), PARAMETER       :: T_FLOOR1 = 'output/T_FLOOR1.txt'                   ! ||   ||
+CHARACTER(LEN=*), PARAMETER       :: T_MASS1 = 'output/T_MASS1.txt'                   ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: T_WALLA1= 'output/T_WALLA1.txt'                  ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: T_WALLB1= 'output/T_WALLB1.txt'                  ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: TI_BLD = 'output/TI_BLD.txt'                     ! ||   ||
+CHARACTER(LEN=*), PARAMETER       :: QI_BLD = 'output/QI_BLD.txt'                     ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: Q_CANYON = 'output/Q_CANYON.txt'                 ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: U_CANYON = 'output/U_CANYON.txt'                 ! ||   ||
 CHARACTER(LEN=*), PARAMETER       :: H_TOWN = 'output/H_TOWN.txt'                     !\\     //
@@ -631,7 +634,7 @@ PROGRAM DRIVER
 ALLOCATE(ZHC_WALL    (1,NWALL_LAYER))
 ALLOCATE(ZTC_WALL    (1,NWALL_LAYER))
 ALLOCATE(ZD_WALL     (1,NWALL_LAYER))
-ALLOCATE(ZT_WALL_A   (1,NWALL_LAYER))
+ALLOCATE(ZT_WALL   (1,NWALL_LAYER))
 ALLOCATE(ZT_WALL_B   (1,NWALL_LAYER))
 
 ALLOCATE(ZHC_FLOOR   (1,NFLOOR_LAYER))
@@ -660,7 +663,7 @@ PROGRAM DRIVER
 ! Inizializations (SYSTEM)
 ! -----------------------------------------------------------
 
-ZT_WALL_B = ZT_WALL_A    ! wall layers temperatures
+ZT_WALL_B = ZT_WALL    ! wall layers temperatures
 !
 
 GSHAD_DAY = .FALSE. ! has shading been necessary this day ?
@@ -866,6 +869,10 @@ PROGRAM DRIVER
 OPEN(UNIT=53, FILE = Forc_WIND, ACCESS = 'APPEND',STATUS = 'REPLACE')
 OPEN(UNIT=54, FILE = Forc_RAIN, ACCESS = 'APPEND',STATUS = 'REPLACE')
 OPEN(UNIT=55, FILE = Forc_SNOW, ACCESS = 'APPEND',STATUS = 'REPLACE')
+
+OPEN(UNIT=56, FILE = T_FLOOR1,   ACCESS = 'APPEND',STATUS = 'REPLACE')
+OPEN(UNIT=57, FILE = T_MASS1,   ACCESS = 'APPEND',STATUS = 'REPLACE')
+OPEN(UNIT=58, FILE = QI_BLD,   ACCESS = 'APPEND',STATUS = 'REPLACE')
 !
 ! -----------------------------------------------------------
 ! Temporal loops
@@ -1011,7 +1018,7 @@ PROGRAM DRIVER
                      XTSUN, ZT_CANYON, ZQ_CANYON, ZU_CANYON,                  &
                      ZT_LOWCAN, ZQ_LOWCAN, ZU_LOWCAN, ZZ_LOWCAN,              &
                      ZTI_BLD,                                                 &
-                     ZT_ROOF, ZT_ROAD, ZT_WALL_A, ZT_WALL_B,                  &
+                     ZT_ROOF, ZT_ROAD, ZT_WALL, ZT_WALL_B,                  &
                      ZWS_ROOF,ZWS_ROAD,                                       &
                      HSNOW_ROOF,                                              &
                      ZWSNOW_ROOF, ZTSNOW_ROOF, ZRSNOW_ROOF, ZASNOW_ROOF,      &
@@ -1118,7 +1125,7 @@ PROGRAM DRIVER
 !  Instantaneous diagnostics
 ZTS_ROOF = ZT_ROOF(1,1)
 ZTS_ROAD = ZT_ROAD(1,1)
-ZTS_WALL_A = ZT_WALL_A(1,1)
+ZTS_WALL_A = ZT_WALL(1,1)
 ZTS_WALL_B = ZT_WALL_B(1,1)
 
 ! Calucalte the total (direct + diffuse radiaitons)town albedo
@@ -1187,6 +1194,10 @@ PROGRAM DRIVER
     WRITE(54,*) XRAIN
     WRITE(55,*) XSNOW
 
+    WRITE(56,*) ZT_FLOOR(1,1)
+    WRITE(57,*) ZT_MASS(1,1)
+    WRITE(58,*) ZQI_BLD
+
 !
 END DO
 !
@@ -1209,7 +1220,7 @@ PROGRAM DRIVER
 DEALLOCATE(ZHC_WALL)
 DEALLOCATE(ZTC_WALL)
 DEALLOCATE(ZD_WALL)
-DEALLOCATE(ZT_WALL_A)
+DEALLOCATE(ZT_WALL)
 DEALLOCATE(ZT_WALL_B)
 DEALLOCATE(ZHC_ROOF)
 DEALLOCATE(ZTC_ROOF)
@@ -1258,6 +1269,12 @@ PROGRAM DRIVER
 CLOSE(53)
 CLOSE(54)
 CLOSE(55)
+
+CLOSE(56)
+CLOSE(57)
+CLOSE(58)
+
+
 !
     WRITE(*,*) ' '
     WRITE(*,*) '    --------------------------'