Merge pull request #576 from GEOS-ESM/rreichle/cleanup/make_bcs

further cleanup of make_bcs utility and CatchmentCN routines
GEOS-ESM · Jun 14, 2022 · 2ff0572 · 2ff0572
2 parents 3e52659 + 9c3baa1
commit 2ff0572
Show file tree

Hide file tree

Showing 13 changed files with 1,549 additions and 5,830 deletions.
diff --git a/...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90 b/...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM40_GridComp/GEOS_CatchCNCLM40GridComp.F90
diff --git a/...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90 b/...and_GridComp/GEOScatchCN_GridComp/GEOScatchCNCLM45_GridComp/GEOS_CatchCNCLM45GridComp.F90
diff --git a/...EOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/utils/compute_FPAR_CDF_M09.F90 b/...EOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/utils/compute_FPAR_CDF_M09.F90
diff --git a/...dComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/utils/math_routines.F90 b/...dComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/utils/math_routines.F90
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc
@@ -234,14 +234,3 @@
 #
 # GEOSagcm=>PRESCRIBE_DVG: 0
 # GEOSldas=>PRESCRIBE_DVG: 0
-
-# ---- Scale CATCHCN ALBEDO and FPAR
-#
-#    0 : NO scaling is performed (default)
-#    1 : Scale albedo to match interannually varying MODIS NIRDF and VISDF anomaly
-#    2 : Scale albedo to match CDFs of model fPAR to MODIS CDFs of fPAR 
-#    3 : Perform both 1 and 2 above 
-#
-# GEOSagcm=>SCALE_ALBFPAR: 0
-# GEOSldas=>SCALE_ALBFPAR: 0
-
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/CMakeLists.txt b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/CMakeLists.txt
@@ -9,7 +9,6 @@ rasterize.F90
 read_riveroutlet.F90
 CubedSphere_GridMod.F90
 rmTinyCatchParaMod.F90
-comp_CATCHCN_AlbScale_parameters.F90
 zip.c
 util.c
 )