Merge pull request #319 from CoLM-Tutorial/master

fix a bug in SingleSrfdata
CoLM-SYSU · Oct 24, 2024 · 211dfbc · 211dfbc
2 parents bea796c + c602aff
commit 211dfbc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/mksrfdata/MOD_SingleSrfdata.F90 b/mksrfdata/MOD_SingleSrfdata.F90
@@ -172,12 +172,12 @@ SUBROUTINE read_surface_data_single (fsrfdata, mksrfdata)
             CALL ncio_read_serial (fsrfdata, 'IGBP_classification', SITE_landtype)
 #endif
          ENDIF
-      ENDIF
 
-      ! IF (SITE_landtype < 0) THEN
-      !    write(*,*) 'Error! Please set namelist SITE_landtype first!'
-      !    CALL CoLM_stop()
-      ! ENDIF
+         IF (SITE_landtype < 0) THEN
+            write(*,*) 'Error! Please set namelist SITE_landtype first!'
+            CALL CoLM_stop()
+         ENDIF
+      ENDIF
 
       DEF_domain%edges = floor(SITE_lat_location)
       DEF_domain%edgen = DEF_domain%edges + 1.0

diff --git a/run/SiteSYSUAtmos_IGBP_VG.nml b/run/SiteSYSUAtmos_IGBP_VG.nml
@@ -24,9 +24,9 @@
    DEF_simulation_time%start_month  = 1
    DEF_simulation_time%start_day    = 1
    DEF_simulation_time%start_sec    = 0
-   DEF_simulation_time%end_year     = 2020
-   DEF_simulation_time%end_month    = 12
-   DEF_simulation_time%end_day      = 31
+   DEF_simulation_time%end_year     = 1951
+   DEF_simulation_time%end_month    = 1
+   DEF_simulation_time%end_day      = 11
    DEF_simulation_time%end_sec      = 86400
    DEF_simulation_time%spinup_year  = 0
    DEF_simulation_time%spinup_month = 1
@@ -36,9 +36,9 @@
 
    DEF_simulation_time%timestep     = 1800.
 
-   DEF_dir_rawdata = '/tera07/CoLMrawdata/'
-   DEF_dir_runtime = '/tera07/CoLMruntime/'
-   DEF_dir_output  = '/tera13/zhangsp/cases'
+   DEF_dir_rawdata = '/shr03/CoLMrawdata/'
+   DEF_dir_runtime = '/shr03/CoLMruntime/'
+   DEF_dir_output  = '/tera09/training/CoLM202X-Tutorial/cases/'
 
    ! soil state init
    DEF_USE_SoilInit  = .true.

diff --git a/run/forcing/CRUJRA.nml b/run/forcing/CRUJRA.nml
@@ -1,7 +1,7 @@
 &nl_colm_forcing
 
   ! ----- forcing -----
-   DEF_dir_forcing  = '/tera06/zhwei/CoLM_Forcing/crujra/' 
+   DEF_dir_forcing  = '/shr03/CoLM_Forcing/crujra/' 
 
    DEF_forcing%dataset           = 'CRUJRA' 
    DEF_forcing%solarin_all_band  = .true.