Merge pull request #1049 from GEOS-ESM/bugfix/borescan_elevation

Bugfix: mean land elevation + v13 bcs

Author: sdrabenh

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Shared/GEOS_SurfaceGridComp.rc

@@ -120,7 +120,7 @@
 #           - backfilled with global land average snow albedo where unavailable
 #           - must use compatible bcs version that includes MODIS-based snow albedo (e.g., v06, v08, v09, ...)
 #           - NOTE: bcs v06, v08, and v09 used approximate averaging of MODIS-based snow albedo to tile space;
-#                   bcs v11 and v12 employ more accurate, raster-based averaging.
+#                   bcs v11, v12 and v13  employ more accurate, raster-based averaging.
 #
 # GEOSagcm=>SNOW_ALBEDO_INFO: 0
 # GEOSldas=>SNOW_ALBEDO_INFO: 0

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py

@@ -195,6 +195,7 @@ def ask_questions(default_grid="Cubed-Sphere"):
    "v10 : NL3 + PEATMAP + MODIS snow alb v2", \
    "v11 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2", \
    "v12 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix", \
+   "v13 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix + mean land elevation fix", \
    "ICA : Icarus        (archived*: /discover/nobackup/projects/gmao/bcs_shared/legacy_bcs/Icarus/)", \
    "GM4 : Ganymed-4_0   (archived*: /discover/nobackup/projects/gmao/bcs_shared/legacy_bcs/Ganymed-4_0/)", \
    "F25 : Fortuna-2_5   (archived*: n/a)"], 

GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/rmTinyCatchParaMod.F90

@@ -33,7 +33,13 @@ module rmTinyCatchParaMod
 
   logical :: preserve_soiltype = .false.
 
-  real*8,  parameter :: Target_mean_land_elev = 614.649D0  ! *8 not used, but keep to avoid non-0-diff changes, reichle, 20 Dec 2024
+  ! Bugfix for Target_mean_land_elev: 
+  ! Previously, the hardcoded value 614.649 m was used as the target mean land elevation.
+  ! This was incorrect because it did not account for the proper cosine-lat-weighted mean over land.
+  ! The correct value, 656.83 m, is derived from NCAR GMTED TOPO 30arcsec dataset.
+  ! This ensures that land elevation adjustment is based on the correct reference mean land elevation.
+
+  real*8, parameter :: Target_mean_land_elev = 656.83D0  ! cosine-lat-weighted mean land elev from NCAR GMTED TOPO 30arcsec 
 
   private
 
@@ -108,7 +114,7 @@ SUBROUTINE init_bcs_config(LBCSV)
     character(*), intent (in) :: LBCSV     ! land BCs version 
 
     select case (trim(LBCSV))
-
+       
     case ("F25")
        LAIBCS  = 'GSWP2'
        SOILBCS = 'NGDC'
@@ -118,7 +124,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        GNU     = 2.17
        use_PEATMAP = .false.
        jpl_height  = .false.
-
+       
     case ("GM4", "ICA")
        LAIBCS  = 'GSWP2'
        SOILBCS = 'NGDC'
@@ -139,7 +145,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .false.
        jpl_height  = .false.
 
-     case ("NL4")
+    case ("NL4")
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'      
@@ -149,7 +155,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .false.
        jpl_height  = .true.
 
-     case ("NL5")
+    case ("NL5")
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -159,7 +165,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .true.
 
-     case ("v06")   
+    case ("v06")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -169,7 +175,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .true.
 
-     case ("v07")   
+    case ("v07")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -178,8 +184,8 @@ SUBROUTINE init_bcs_config(LBCSV)
        GNU     = 1.0
        use_PEATMAP = .true.
        jpl_height  = .false.
-
-     case ("v08")   
+       
+    case ("v08")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -189,7 +195,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .false.
        jpl_height  = .false.
 
-     case ("v09")   
+    case ("v09")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -199,7 +205,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .false.
 
-     case ("v10")   
+    case ("v10")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -209,7 +215,7 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .false.
 
-     case ("v11")   
+    case ("v11")   
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD'
        MODALB  = 'MODIS2'
@@ -219,7 +225,13 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .true.
 
-     case ("v12")   
+    case ("v12","v13")  
+
+       ! "v12" and "v13" are identical except for:
+       ! - topography used for the atm (processed outside of make_bcs)
+       ! - bug fix for land elevation in catchment.def file
+       ! - generation of nc4-formatted tile file
+ 
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD_b'
        MODALB  = 'MODIS2'
@@ -230,16 +242,16 @@ SUBROUTINE init_bcs_config(LBCSV)
        jpl_height  = .true.
 
     case default
-
+       
        print *,'init_bcs_config(): unknown land boundary conditions version (LBCSV)'
        stop
-
+       
     end select
-             
+    
   END SUBROUTINE init_bcs_config
-
+  
   ! --------------------------------------------------------------------------------------------
-
+  
   SUBROUTINE Get_MidTime (                           &
                           yr1,mn1,dy1,yr2,mn2,dy2,   &
                           MIDT)