update to latest teb (#3)

TEB-model · Jan 21, 2021 · aee7632 · aee7632
1 parent 77fc06d
commit aee7632
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 37 deletions.
diff --git a/external/teb/CMakeLists.txt b/external/teb/CMakeLists.txt
@@ -11,8 +11,8 @@ if (DEFINED TEB_DIR)
 else()
     set(dir_options
         GIT_REPOSITORY https://github.com/teb-model/teb
-        # TODO revert to tag after new release is out (need ninja fix)
-        GIT_TAG ninja-patch # 4.0.1
+        # TODO revert to tag after new release is out
+        GIT_TAG 23ca2c7b3561bbebcfa51f7fdd07f002bd6fc4ca
         )
 endif()
 

diff --git a/phys/module_sf_teb.F b/phys/module_sf_teb.F
@@ -115,11 +115,11 @@ SUBROUTINE TEB (   &
       USE module_sf_urban, only:  TEB_SOLAR_PANEL_TBL,                  &
         TEB_USE_NOAH, TEB_USE_ZGARDEN_FROM_TBL,  &
         TEB_LGARDEN_TBL, TEB_GREENROOF_TBL, TEB_HROAD_DIR_TBL, TEB_ZROAD_DIR_TBL, TEB_WALL_OPT_TBL,                 &
-        TEB_COOL_COIL_TBL, TEB_HEAT_COIL_TBL, TEB_F_WATER_COND_TBL, TEB_HNATVENT_TBL, TEB_ZNATVENT_TBL,             &
+        TEB_COOL_COIL_TBL, TEB_HEAT_COIL_TBL, TEB_F_WATER_COND_TBL, TEB_ZNATVENT_TBL,             &
         TEB_F_WASTE_CAN_TBL, TEB_QIN_TBL, TEB_QIN_FRAD_TBL, TEB_QIN_FLAT_TBL, TEB_GR_TBL, TEB_EFF_HEAT_TBL,             &
         TEB_INF_TBL, TEB_TCOOL_TARGET_TBL, TEB_THEAT_TARGET_TBL, TEB_HR_TARGET_TBL, TEB_V_VENT_TBL,                 &
         TEB_CAP_SYS_HEAT_TBL, TEB_CAP_SYS_RAT_TBL, TEB_T_ADP_TBL, TEB_M_SYS_RAT_TBL, TEB_COP_RAT_TBL,               &
-        TEB_SHGC_TBL, TEB_SHGC_SH_TBL, TEB_U_WIN_TBL, TEB_LSHADE_TBL, TEB_ZSHADE_TBL, TEB_FLOOR_HEIGHT_TBL,             &
+        TEB_SHGC_TBL, TEB_SHGC_SH_TBL, TEB_U_WIN_TBL, TEB_ZSHADE_TBL, TEB_FLOOR_HEIGHT_TBL,             &
         TEB_CH_BEM_TBL, TEB_ROUGH_ROOF_TBL, TEB_ROUGH_WALL_TBL, TEB_PAR_RD_IRRIG_TBL, TEB_RD_START_MONTH_TBL,       &
         TEB_RD_END_MONTH_TBL, TEB_RD_START_HOUR_TBL, TEB_RD_END_HOUR_TBL, TEB_RD_24H_IRRIG_TBL, TEB_EMIS_PANEL_TBL, &
         TEB_ALB_PANEL_TBL, TEB_EFF_PANEL_TBL, TEB_FRAC_PANEL_TBL, TEB_RESIDENTIAL_TBL, TEB_DT_RES_TBL, TEB_DT_OFF_TBL,  &
@@ -499,7 +499,7 @@ SUBROUTINE TEB (   &
                      TEB_ALB_WALL_TBL(URBTYPE), TEB_EMIS_WALL_TBL(URBTYPE),                        &
                      TEB_HC_WALL_TBL(:, URBTYPE), TEB_TC_WALL_TBL(:, URBTYPE), TEB_D_WALL_TBL(:, URBTYPE),    &
                      TEB_COOL_COIL_TBL(URBTYPE), TEB_F_WATER_COND_TBL(URBTYPE), TEB_HEAT_COIL_TBL(URBTYPE),  &
-                     TEB_HNATVENT_TBL(URBTYPE), TEB_ZNATVENT_TBL(URBTYPE), &
+                     TEB_ZNATVENT_TBL(URBTYPE), &
                      TEB_F_WASTE_CAN_TBL(URBTYPE), &
                      TEB_QIN_TBL(URBTYPE), TEB_QIN_FRAD_TBL(URBTYPE),   &
                      TEB_QIN_FLAT_TBL(URBTYPE), TEB_GR_TBL(URBTYPE), TEB_EFF_HEAT_TBL(URBTYPE), TEB_INF_TBL(URBTYPE),                         &
@@ -511,7 +511,7 @@ SUBROUTINE TEB (   &
                      TEB_D_FLOOR_TBL(:, URBTYPE), &
                      TEB_SHGC_TBL(URBTYPE),      &
                      TEB_SHGC_SH_TBL(URBTYPE),     &
-                     TEB_LSHADE_TBL(URBTYPE), TEB_ZSHADE_TBL(URBTYPE),       &
+                     TEB_ZSHADE_TBL(URBTYPE),       &
                      TEB_CBEM_TBL(URBTYPE),                                                    &
                      TEB_CH_BEM_TBL(URBTYPE), TEB_ROUGH_ROOF_TBL(URBTYPE), TEB_ROUGH_WALL_TBL(URBTYPE), &
                      TEB_PAR_RD_IRRIG_TBL(URBTYPE), TEB_RD_START_MONTH_TBL(URBTYPE), TEB_RD_END_MONTH_TBL(URBTYPE),           &

diff --git a/phys/module_sf_urban.F b/phys/module_sf_urban.F
@@ -163,7 +163,6 @@ MODULE module_sf_urban
    CHARACTER(LEN=12),ALLOCATABLE, DIMENSION(:)  :: TEB_COOL_COIL_TBL      
    CHARACTER(LEN=6), ALLOCATABLE, DIMENSION(:)  :: TEB_HEAT_COIL_TBL      
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_F_WATER_COND_TBL   
-   CHARACTER(LEN=4), ALLOCATABLE, DIMENSION(:)  :: TEB_HNATVENT_TBL       
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_ZNATVENT_TBL       
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_F_WASTE_CAN_TBL    
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_QIN_TBL            
@@ -184,8 +183,6 @@ MODULE module_sf_urban
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_SHGC_TBL            
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_SHGC_SH_TBL         
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_U_WIN_TBL           
-   LOGICAL,          ALLOCATABLE, DIMENSION(:)  :: TEB_LSHADE_TBL          
-   LOGICAL                                      :: TEB_LSHADE_INITED   
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_ZSHADE_TBL          
    CHARACTER(LEN=3), ALLOCATABLE, DIMENSION(:)  :: TEB_CBEM_TBL            
    REAL,             ALLOCATABLE, DIMENSION(:)  :: TEB_FLOOR_HEIGHT_TBL    
@@ -529,7 +526,6 @@ SUBROUTINE urban(LSOLAR,                                           & ! L
 #ifdef WRF_TEB
    ! External TEB library
    USE MODI_INI_CSTS,         ONLY: INI_CSTS
-   USE MODI_INIT_SURFCONSPHY, ONLY: INIT_SURFCONSPHY
 #endif
 
    IMPLICIT NONE
@@ -2420,8 +2416,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_HEAT_COIL_TBL in urban_param_init')
             ALLOCATE( TEB_F_WATER_COND_TBL(ICATE), stat=allocate_status )
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_F_WATER_COND_TBL in urban_param_init')
-            ALLOCATE( TEB_HNATVENT_TBL(ICATE), stat=allocate_status )
-            if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_HNATVENT_TBL in urban_param_init')
             ALLOCATE( TEB_ZNATVENT_TBL(ICATE), stat=allocate_status )
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_ZNATVENT_TBL in urban_param_init')
             ALLOCATE( TEB_F_WASTE_CAN_TBL(ICATE), stat=allocate_status )
@@ -2462,8 +2456,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_SHGC_SH_TBL in urban_param_init')
             ALLOCATE( TEB_U_WIN_TBL(ICATE), stat=allocate_status )
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_U_WIN_TBL in urban_param_init')
-            ALLOCATE( TEB_LSHADE_TBL(ICATE), stat=allocate_status )
-            if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_LSHADE_TBL in urban_param_init')
             ALLOCATE( TEB_ZSHADE_TBL(ICATE), stat=allocate_status )
             if(allocate_status /= 0) FATAL_ERROR('Error allocating TEB_ZSHADE_TBL in urban_param_init')
             ALLOCATE( TEB_CBEM_TBL(ICATE), stat=allocate_status )
@@ -2598,7 +2590,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
             TEB_COOL_COIL_TBL      = repeat(UNINIT_CHAR, 12)
             TEB_HEAT_COIL_TBL      = repeat(UNINIT_CHAR, 6)
             TEB_F_WATER_COND_TBL   = UNINIT_REAL
-            TEB_HNATVENT_TBL       = repeat(UNINIT_CHAR, 4)
             TEB_ZNATVENT_TBL       = UNINIT_REAL
             TEB_F_WASTE_CAN_TBL    = UNINIT_REAL
             TEB_QIN_TBL            = UNINIT_REAL
@@ -2973,8 +2964,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
          read(string(indx+1:),*)TEB_HEAT_COIL_TBL(1:icate)
       else if (name == "TEB_F_WATER_COND") then
          read(string(indx+1:),*)TEB_F_WATER_COND_TBL(1:icate)
-      else if (name == "TEB_HNATVENT") then
-         read(string(indx+1:),*)TEB_HNATVENT_TBL(1:icate)
       else if (name == "TEB_ZNATVENT") then
          read(string(indx+1:),*)TEB_ZNATVENT_TBL(1:icate)
       else if (name == "TEB_F_WASTE_CAN") then
@@ -3059,9 +3048,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
          read(string(indx+1:),*)TEB_SHGC_SH_TBL(1:icate)
       else if (name == "TEB_U_WIN") then
          read(string(indx+1:),*)TEB_U_WIN_TBL(1:icate)
-      else if (name == "TEB_LSHADE") then
-         read(string(indx+1:),*)TEB_LSHADE_TBL(1:icate)
-         TEB_LSHADE_INITED = .TRUE.
       else if (name == "TEB_ZSHADE") then
          read(string(indx+1:),*)TEB_ZSHADE_TBL(1:icate)
       else if (name == "TEB_CBEM") then
@@ -3229,7 +3215,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
       call check_init_string_array(TEB_COOL_COIL_TBL, "TEB_COOL_COIL")
       call check_init_string_array(TEB_HEAT_COIL_TBL, "TEB_HEAT_COIL")
       call check_init_real_array(TEB_F_WATER_COND_TBL, "TEB_F_WATER_COND")
-      call check_init_string_array(TEB_HNATVENT_TBL, "TEB_HNATVENT")
       call check_init_real_array(TEB_ZNATVENT_TBL, "TEB_ZNATVENT")
       call check_init_real_array(TEB_F_WASTE_CAN_TBL, "TEB_F_WASTE_CAN")
       call check_init_real_array(TEB_QIN_TBL, "TEB_QIN")
@@ -3250,7 +3235,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
       call check_init_real_array(TEB_SHGC_TBL, "TEB_SHGC")
       call check_init_real_array(TEB_SHGC_SH_TBL, "TEB_SHGC_SH")
       call check_init_real_array(TEB_U_WIN_TBL, "TEB_U_WIN")
-      call check_init_logical(TEB_LSHADE_INITED, "TEB_LSHADE")
       call check_init_real_array(TEB_ZSHADE_TBL, "TEB_ZSHADE")
       call check_init_string_array(TEB_CBEM_TBL, "TEB_CBEM")
       call check_init_real_array(TEB_FLOOR_HEIGHT_TBL, "TEB_FLOOR_HEIGHT")
@@ -3278,7 +3262,6 @@ SUBROUTINE urban_param_init(DZR,DZB,DZG,num_soil_layers, &
 #ifdef WRF_TEB
       ! initialize constants in external TEB library
       CALL INI_CSTS
-      CALL INIT_SURFCONSPHY
 #endif
    end if
 

diff --git a/run/URBPARM_TEB.TBL b/run/URBPARM_TEB.TBL
@@ -74,13 +74,6 @@ TEB_FRAC_PANEL: 0.0 0.0 0.0
 
 TEB_PAR_RD_IRRIG: .FALSE. .FALSE. .FALSE.
 
-#
-# TEB_HNATVENT: flag to activate natural ventilation 'NONE', 'MANU', 'AUTO'
-#         (sf_urban_physics=4)
-#
-
-TEB_HNATVENT: NONE NONE NONE
-
 #
 # TEB_COOL_COIL: option for cooling device type ('IDEAL', 'DXCOIL', 'MinimalDX')
 #         (sf_urban_physics=4)
@@ -510,13 +503,6 @@ TEB_U_WIN: 2.716 2.716 2.716
 # Shading devices
 ##############################################################################
 
-#
-# TEB_LSHADE: Flag to use shading devices
-#         (sf_urban_physics=4)
-#
-
-TEB_LSHADE: .FALSE. .FALSE. .FALSE.
-
 #
 # TEB_ZSHADE: flag to activate shading devices (-> REAL for i/o 0. or 1)
 #         (sf_urban_physics=4)