Merge pull request #324 from yuanhuas/master

Rename LUCY data id name and related IO files. [by @wenzong Dong]

main/CoLMMAIN.F90

@@ -94,7 +94,7 @@ SUBROUTINE CoLMMAIN ( &
 
          ! TUNABLE modle constants
            zlnd,         zsno,         csoilc,       dewmx,        &
-           ! 'wtfact' is updated to gridded 'fsatmax' data. 
+           ! 'wtfact' is updated to gridded 'fsatmax' data.
            capr,         cnfac,        ssi,                        &
            wimp,         pondmx,       smpmax,       smpmin,       &
            trsmx0,       tcrit,        &
@@ -217,8 +217,8 @@ SUBROUTINE CoLMMAIN ( &
         psi0       (nl_soil) ,&! minimum soil suction [mm]
         bsw        (nl_soil) ,&! clapp and hornbereger "b" parameter [-]
         theta_r  (1:nl_soil) ,&! residual water content (cm3/cm3)
-        fsatmax              ,&! maximum saturated area fraction [-] 
-        fsatdcf              ,&! decay factor in calucation of saturated area fraction [1/m] 
+        fsatmax              ,&! maximum saturated area fraction [-]
+        fsatdcf              ,&! decay factor in calucation of saturated area fraction [1/m]
 #ifdef vanGenuchten_Mualem_SOIL_MODEL
         alpha_vgm(1:nl_soil) ,&! the parameter corresponding approximately to the inverse of the air-entry value
         n_vgm    (1:nl_soil) ,&! a shape parameter
@@ -272,7 +272,7 @@ SUBROUTINE CoLMMAIN ( &
         zsno        ,&! roughness length for snow [m]
         csoilc      ,&! drag coefficient for soil under canopy [-]
         dewmx       ,&! maximum dew
-        ! wtfact    ,&! (updated to gridded 'fsatmax' data) fraction of model area with high water table 
+        ! wtfact    ,&! (updated to gridded 'fsatmax' data) fraction of model area with high water table
         capr        ,&! tuning factor to turn first layer T into surface T
         cnfac       ,&! Crank Nicholson factor between 0 and 1
         ssi         ,&! irreducible water saturation of snow
@@ -1167,7 +1167,7 @@ SUBROUTINE CoLMMAIN ( &
               dz_soisno(:0),t_soisno(:0) ,wliq_soisno(:0) ,wice_soisno(:0) ,&
               fiold(:0)    ,snl          ,sag             ,scv             ,&
               snowdp       ,lake_icefrac )
-         
+
          CALL laketem ( &
               ! "in" laketem arguments
               ! ---------------------------
@@ -1234,7 +1234,7 @@ SUBROUTINE CoLMMAIN ( &
             rsur = max(0., pg_rain + pg_snow - aa - a)
             rnof = rsur
          ELSE
-           
+
             wdsrf = sum(dz_lake) * 1.e3
 
 #ifndef CatchLateralFlow

main/MOD_Albedo.F90

@@ -401,7 +401,7 @@ SUBROUTINE albland (ipatch, patchtype, deltim,&
 ! ----------------------------------------------------------------------
 ! 4. canopy albedos: two stream approximation or 3D canopy radiation transfer
 ! ----------------------------------------------------------------------
-      IF (lai+sai > 1e-6 .and. patchtype < 4) THEN
+      IF (lai+sai > 1e-6 .and. patchtype < 3) THEN
 
          ! initialization
          albv(:,:) = albg(:,:)

main/MOD_LeafTemperaturePC.F90

@@ -521,8 +521,8 @@ SUBROUTINE  LeafTemperaturePC ( &
          ENDIF
       ENDDO
 
+      ! When there is no vegetation in this Plant Community Patch, RETURN
       IF (.not. is_vegetated_patch) THEN
-         print *, "NOTE: There is no vegetation in this Plant Community Patch, RETURN."
          RETURN
       ENDIF
 

main/URBAN/CoLMMAIN_Urban.F90

@@ -40,7 +40,7 @@
 ! !REVISIONS:
 !
 !  03/2022, Hua Yuan: complete the model with full coupling, and make
-!           it possible to run multiple scenario assumptions  through
+!           it possible to run multiple scenario assumptions through
 !           macro definitions.
 !
 !  07/2022, Wenzong Dong: add LUCY model initial version.

mkinidata/MOD_UrbanReadin.F90

@@ -48,7 +48,7 @@ SUBROUTINE Urban_readin (dir_landdata, lc_year)
 
    integer, intent(in) :: lc_year    ! which year of land cover data used
    character(len=256), intent(in) :: dir_landdata
-   character(len=256) :: dir_rawdata
+   character(len=256) :: dir_rawdata, dir_runtime
    character(len=256) :: lndname
    character(len=256) :: cyear
 
@@ -169,8 +169,8 @@ SUBROUTINE Urban_readin (dir_landdata, lc_year)
       CALL ncio_read_vector (lndname, 'URBAN_TREE_TOP', landurban, htop_urb)
 #endif
 
-      dir_rawdata = DEF_dir_rawdata
-      lndname = trim(dir_rawdata)//'/urban/'//'/LUCY_rawdata.nc'
+      dir_runtime = DEF_dir_runtime
+      lndname = trim(dir_runtime)//'/urban/'//'/LUCY_rawdata.nc'
 
       CALL ncio_read_bcast_serial (lndname,  "NUMS_VEHC"             , lvehicle     )
       CALL ncio_read_bcast_serial (lndname,  "WEEKEND_DAY"           , lweek_holiday)

mksrfdata/Aggregation_Urban.F90

@@ -80,7 +80,7 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
    type(block_data_int32_2d) :: reg_typid
 
    ! output variables
-   integer , ALLOCATABLE, dimension(:) :: LUCY_coun
+   integer , ALLOCATABLE, dimension(:) :: LUCY_rid
    real(r8), ALLOCATABLE, dimension(:) :: pop_den
    real(r8), ALLOCATABLE, dimension(:) :: pct_tree
    real(r8), ALLOCATABLE, dimension(:) :: htop_urb
@@ -190,9 +190,9 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
       ! allocate and read the LUCY id
       IF (p_is_io) THEN
 
-         landname = TRIM(dir_rawdata)//'urban/LUCY_countryid.nc'
+         landname = TRIM(dir_rawdata)//'urban/LUCY_regionid.nc'
          CALL allocate_block_data (grid_urban_5km, LUCY_reg)
-         CALL ncio_read_block (landname, 'LUCY_COUNTRY_ID', grid_urban_5km, LUCY_reg)
+         CALL ncio_read_block (landname, 'LUCY_REGION_ID', grid_urban_5km, LUCY_reg)
 
 #ifdef USEMPI
          CALL aggregation_data_daemon (grid_urban_5km, data_i4_2d_in1 = LUCY_reg)
@@ -201,9 +201,9 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
 
       IF (p_is_worker) THEN
 
-         allocate ( LUCY_coun (numurban))
+         allocate ( LUCY_rid (numurban))
 
-         LUCY_coun (:) = 0
+         LUCY_rid (:) = 0
 
          ! loop for each urban patch to get the LUCY id of all fine grid
          ! of iurban patch, then assign the most frequence id to this urban patch
@@ -212,7 +212,7 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
             CALL aggregation_request_data (landurban, iurban, grid_urban_5km, zip = USE_zip_for_aggregation, &
                data_i4_2d_in1 = LUCY_reg, data_i4_2d_out1 = LUCY_reg_one)
             ! the most frequence id to this urban patch
-            LUCY_coun(iurban) = num_max_frequency (LUCY_reg_one)
+            LUCY_rid(iurban) = num_max_frequency (LUCY_reg_one)
          ENDDO
 #ifdef USEMPI
          CALL aggregation_worker_done ()
@@ -221,19 +221,19 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
 
 #ifndef SinglePoint
       ! output
-      landname = trim(landsrfdir)//'/LUCY_country_id.nc'
+      landname = trim(landsrfdir)//'/LUCY_region_id.nc'
       CALL ncio_create_file_vector (landname, landurban)
       CALL ncio_define_dimension_vector (landname, landurban, 'urban')
-      CALL ncio_write_vector (landname, 'LUCY_id', 'urban', landurban, LUCY_coun, DEF_Srfdata_CompressLevel)
+      CALL ncio_write_vector (landname, 'LUCY_id', 'urban', landurban, LUCY_rid, DEF_Srfdata_CompressLevel)
 
 #ifdef SrfdataDiag
       typindex = (/(ityp, ityp = 1, N_URB)/)
-      landname  = trim(dir_srfdata) // '/diag/LUCY_country_id.nc'
-      ! CALL srfdata_map_and_write (LUCY_coun*1.0, landurban%settyp, typindex, m_urb2diag, &
+      landname  = trim(dir_srfdata) // '/diag/LUCY_region_id.nc'
+      ! CALL srfdata_map_and_write (LUCY_rid*1.0, landurban%settyp, typindex, m_urb2diag, &
       !    -1.0e36_r8, landname, 'LUCY_id_'//trim(cyear), compress = 0, write_mode = 'one')
 #endif
 #else
-      SITE_lucyid(:) = LUCY_coun
+      SITE_lucyid(:) = LUCY_rid
 #endif
 
 
@@ -242,7 +242,7 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
 #endif
 
 #ifdef RangeCheck
-      CALL check_vector_data ('LUCY_ID ', LUCY_coun)
+      CALL check_vector_data ('LUCY_ID ', LUCY_rid)
 #endif
 
       ! ******* POP_DEN *******
@@ -1100,7 +1100,7 @@ SUBROUTINE Aggregation_Urban (dir_rawdata, dir_srfdata, lc_year, &
 
       IF (p_is_worker) THEN
 
-         IF ( allocated (LUCY_coun) ) deallocate (LUCY_coun )
+         IF ( allocated (LUCY_rid ) ) deallocate (LUCY_rid  )
          IF ( allocated (pop_den  ) ) deallocate (pop_den   )
          IF ( allocated (pct_tree ) ) deallocate (pct_tree  )
          IF ( allocated (htop_urb ) ) deallocate (htop_urb  )