Merge pull request CoLM-SYSU#340 from zhangsp8/master

Minor modification.
bnuweinan · Dec 10, 2024 · 2c7f65a · 2c7f65a
2 parents 2166830 + b9c1970
commit 2c7f65a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/main/MOD_Hist.F90 b/main/MOD_Hist.F90
@@ -182,7 +182,9 @@ SUBROUTINE hist_out (idate, deltim, itstamp, etstamp, ptstamp, &
       CASE ('YEARLY')
          lwrite = isendofyear (idate, deltim) .or. (.not. (itstamp < etstamp))
       CASE default
+         lwrite = .false.
          write(*,*) 'Warning : Please USE one of TIMESTEP/HOURLY/DAILY/MONTHLY/YEARLY for history frequency.'
+         write(*,*) '          Set to FALSE by default.                                                     '
       END select
 
       IF (lwrite) THEN

diff --git a/main/MOD_Vars_TimeVariables.F90 b/main/MOD_Vars_TimeVariables.F90
@@ -880,7 +880,9 @@ FUNCTION save_to_restart (idate, deltim, itstamp, ptstamp) result(rwrite)
       CASE ('YEARLY')
          rwrite = isendofyear(idate, deltim)
       CASE default
+         rwrite = .false.
          write(*,*) 'Warning: Please USE one of TIMESTEP/HOURLY/DAILY/MONTHLY/YEARLY for restart frequency.'
+         write(*,*) '         Set to FALSE by default.                                                     '
       ENDSELECT
 
       IF (rwrite) THEN

diff --git a/mksrfdata/MKSRFDATA.F90 b/mksrfdata/MKSRFDATA.F90
@@ -110,9 +110,9 @@ PROGRAM MKSRFDATA
 
 #ifdef SinglePoint
 #ifndef URBAN_MODEL
-   CALL read_surface_data_single (SITE_fsrfdata, mksrfdata=.true.)
+   CALL read_surface_data_single (SITE_fsitedata, mksrfdata=.true.)
 #else
-   CALL read_urban_surface_data_single (SITE_fsrfdata, mksrfdata=.true.)
+   CALL read_urban_surface_data_single (SITE_fsitedata, mksrfdata=.true.)
 #endif
 #endif
 

diff --git a/mksrfdata/MOD_LandPatch.F90 b/mksrfdata/MOD_LandPatch.F90
@@ -124,7 +124,7 @@ SUBROUTINE landpatch_build (lc_year)
          file_patch = trim(DEF_dir_rawdata)//'landtypes/landtype-igbp-modis-'//trim(cyear)//'.nc'
 #else
          !TODO: need usgs land cover type data
-         file_patch = trim(DEF_dir_rawdata) //'/landtypes/landtype_usgs_update.nc'
+         file_patch = trim(DEF_dir_rawdata) //'/landtypes/landtype-usgs-update.nc'
 #endif
          CALL ncio_read_block (file_patch, 'landtype', gpatch, patchdata)
 

diff --git a/share/MOD_Namelist.F90 b/share/MOD_Namelist.F90
@@ -57,7 +57,7 @@ MODULE MOD_Namelist
 ! ----- Part 3: For Single Point -----
 ! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-   character(len=256) :: SITE_fsrfdata   = 'null'
+   character(len=256) :: SITE_fsitedata = 'null'
 
    real(r8) :: SITE_lon_location = 113.5897
    real(r8) :: SITE_lat_location = 22.3507
@@ -818,7 +818,7 @@ SUBROUTINE read_namelist (nlfile)
       DEF_CASE_NAME,                          &
       DEF_domain,                             &
 
-      SITE_fsrfdata,                          &
+      SITE_fsitedata,                         &
       SITE_lon_location,                      &
       SITE_lat_location,                      &
       SITE_landtype,                          &