Merge pull request #273 from CoLM-SYSU/revert-272-master

Revert "Add meteorological forcing downscaling module"
CoLM-SYSU · Jun 11, 2024 · c67c2f9 · c67c2f9
2 parents 1b2af52 + ef11a6b
commit c67c2f9
Show file tree

Hide file tree

Showing 35 changed files with 1,501 additions and 8,653 deletions.
diff --git a/Makefile b/Makefile
@@ -77,7 +77,6 @@ OBJS_MKSRFDATA = \
 				  Aggregation_SoilParameters.o      \
 				  Aggregation_DBedrock.o            \
 				  Aggregation_Topography.o          \
-				  Aggregation_TopographyFactors.o   \
 				  Aggregation_Urban.o               \
 				  MOD_MeshFilter.o                  \
 				  MOD_RegionClip.o                  \
@@ -128,7 +127,6 @@ OBJS_BASIC =    \
 				 MOD_NdepData.o                 \
 				 MOD_FireData.o                 \
 				 MOD_OrbCoszen.o                \
-				 MOD_OrbCosazi.o                \
 				 MOD_3DCanopyRadiation.o        \
 				 MOD_Aerosol.o                  \
 				 MOD_SnowSnicar.o               \

diff --git a/include/Makeoptions b/include/Makeoptions
diff --git a/include/Makeoptions b/include/Makeoptions
@@ -0,0 +1 @@
+Makeoptions.gnu
diff --git a/include/Makeoptions.CMA-HPC b/include/Makeoptions.CMA-HPC
diff --git a/include/Makeoptions.SYSU-BaiduBoat_Parallel_with_zip b/include/Makeoptions.SYSU-BaiduBoat_Parallel_with_zip
diff --git a/include/Makeoptions.gnu b/include/Makeoptions.gnu
@@ -4,8 +4,11 @@
 
   FF = mpif90 -fopenmp
 
-  NETCDF_LIB = /usr/lib/x86_64-linux-gnu
-  NETCDF_INC = /usr/include
+NETCDF_LIB = /usr/lib/x86_64-linux-gnu
+NETCDF_INC = /usr/include
+
+#  NETCDF_LIB = /opt/netcdf-c-4.9.2-fortran-4.6.0-gnu/lib
+#  NETCDF_INC = /opt/netcdf-c-4.9.2-fortran-4.6.0-gnu/include
 
   MOD_CMD = -J
 

diff --git a/include/Makeoptions_origin b/include/Makeoptions_origin
diff --git a/include/define.h b/include/define.h
@@ -20,7 +20,7 @@
 ! 3.1 If defined, range of variables is checked.
 #define RangeCheck
 ! 3.1 If defined, surface data in vector is mapped to gridded data for checking.
-#define SrfdataDiag
+#undef SrfdataDiag
 
 ! 4. If defined, MPI parallelization is enabled.
 #define USEMPI
@@ -35,20 +35,16 @@
 #define  vanGenuchten_Mualem_SOIL_MODEL
 ! 5.2 If defined, lateral flow is modeled.
 #define CatchLateralFlow
-#define UnstrLateralFlow
 !    Conflicts :
 #ifndef CATCHMENT
 #undef CatchLateralFlow
 #endif
-#ifndef UNSTRUCTURED
-#undef UnstrLateralFlow
-#endif
 
 ! 6. If defined, CaMa-Flood model will be used.
 #undef CaMa_Flood
 
 ! 7. If defined, BGC model is used.
-#undef  BGC
+#undef BGC
 
 !    Conflicts :  only used when LULC_IGBP_PFT is defined.
 #ifndef LULC_IGBP_PFT

diff --git a/main/MOD_Const_PFT.F90 b/main/MOD_Const_PFT.F90
@@ -375,7 +375,7 @@ MODULE MOD_Const_PFT
          , 57.0, 57.0, 57.0, 57.0, 57.0, 57.0, 57.0, 57.0&
          , 57.0, 57.0, 57.0, 57.0, 57.0, 57.0, 57.0  &
 #endif
-         /) * 0.3 * 1.e-6
+         /) * 1.e-6
 
    ! quantum efficiency
    real(r8), parameter :: effcon_p(0:N_PFT+N_CFT-1) &

diff --git a/main/MOD_CropReadin.F90 b/main/MOD_CropReadin.F90
@@ -42,12 +42,12 @@ SUBROUTINE CROP_readin ()
 
    character(len=256) :: file_crop
    type(grid_type)    :: grid_crop
-   type(block_data_real8_2d)    :: f_xy_crop
+   type(block_data_real8_2d)  :: f_xy_crop
    type(spatial_mapping_type) :: mg2patch_crop
    type(spatial_mapping_type) :: mg2pft_crop
    character(len=256) :: file_irrig
    type(grid_type)    :: grid_irrig
-   type(block_data_int32_2d)    :: f_xy_irrig
+   type(block_data_int32_2d)  :: f_xy_irrig
    type(spatial_mapping_type) :: mg2pft_irrig
 
    real(r8),allocatable :: pdrice2_tmp      (:)