using v13 for this coupled grids bathymetry update

Author: biljanaorescanin

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

@@ -198,8 +198,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", \
-   "v14 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix + mean land elevation fix + MOM6 v2 (OM4) ocean-seaice bathymetry", \
+   "v13 : NL3 + JPL veg height + PEATMAP + MODIS snow alb v2 + Argentina peatland fix + mean land elevation fix + MOM6 v2 (OM4) ocean-seaice bathymetry", \
    "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/make_bcs_shared.py

@@ -23,19 +23,18 @@
     "v10": {"TOPO_VERSION": "v1", "MOM6_BATHY_VERSION": "v1"},
     "v11": {"TOPO_VERSION": "v1", "MOM6_BATHY_VERSION": "v1"},
     "v12": {"TOPO_VERSION": "v1", "MOM6_BATHY_VERSION": "v1"},
-    "v13": {"TOPO_VERSION": "v1", "MOM6_BATHY_VERSION": "v1"},
-    "v14": {"TOPO_VERSION": "v2", "MOM6_BATHY_VERSION": "v2"},
+    "v13": {"TOPO_VERSION": "v2", "MOM6_BATHY_VERSION": "v2"},
 }
 
 _DEFAULTS = {"TOPO_VERSION": "v1", "MOM6_BATHY_VERSION": "v1"}
 
 def _normalize_lbcsv(label: str) -> str:
     v = (label or "").strip()
-    m = re.match(r'[vV]?\d+|[A-Za-z0-9]+', v)  # accepts v14 / 14 / NL3 / etc.
+    m = re.match(r'[vV]?\d+|[A-Za-z0-9]+', v)  # accepts v13 / 13 / NL3 / etc.
     if not m:
         return v
     key = m.group(0)
-    # normalize numeric like '14' -> 'v14'
+    # normalize numeric like '13' -> 'v13'
     if key.isdigit():
         key = 'v' + key
     return key

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

@@ -12,7 +12,7 @@ PROGRAM mkCatchParam
 !     -y: Size of latitude dimension of input raster.             DEFAULT: 4320
 !     -b: Position of dateline w.r.t. first grid cell boundaries. DEFAULT: DC (dateline-on-center)
 !     -g: Gridname (name of the .til or .rst file without file extension)  
-!     -v: LBCSV : Land bcs version (F25, GM4, ICA, NL3, NL4, NL5, v06, v07, v08, v09)
+!     -v: LBCSV : Land bcs version (F25, GM4, ICA, NL3, NL4, NL5, v06, v07, v08, v09, v11, v12 and v13 )
 !     
 !
 ! This program is good to generate  

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

@@ -226,13 +226,12 @@ SUBROUTINE init_bcs_config(LBCSV)
        use_PEATMAP = .true.
        jpl_height  = .true.
 
-    case ("v12","v13","v14")  
-       !   "v12", "v13", and "v14" are identical except for:
-       ! - ATM topography: v12/v13 use TOPO v1; v14 uses TOPO v2.
-       ! - catchment.def land-elevation bug fix: absent in v12; present in v13/v14.
-       ! - netCDF-4 (NC4) tile-file generation: absent in v12; present in v13/v14.
-       ! - Coupled-model BC land properties vs AGCM: inconsistency present in v12; fixed in v13/v14.
-       ! - Coupled atmosphere-ocean-sea ice: v14 uses MOM6/v2 (OM4) ocean bathymetry; v12/v13 use v1.       
+    case ("v12","v13")  
+       !   "v12" are "v13" are identical except for:
+       ! - catchment.def land-elevation bug fix: absent in v12; present in v13.
+       ! - netCDF-4 (NC4) tile-file generation: absent in v12; present in v13.
+       ! - Coupled-model BC land properties vs AGCM: inconsistency present in v12; fixed in v13.
+       ! - Coupled atmosphere-ocean-sea ice: v13 uses MOM6/v2 (OM4) ocean bathymetry; v12 v1.       
 
        LAIBCS  = 'MODGEO'
        SOILBCS = 'HWSD_b'