Merge pull request #763 from GEOS-ESM/feature/wjiang/clean_up_make_bcs

Cleanup of make_bcs tools that generate raster and tile files
GEOS-ESM · Jul 17, 2023 · fc141b3 · fc141b3
2 parents 2260a2e + 759f83c
commit fc141b3
Show file tree

Hide file tree

Showing 4 changed files with 1,433 additions and 1,179 deletions.
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs
@@ -1403,7 +1403,6 @@ if( $grid == ease ) then
   set             BCNAME = ${EASEVERSION}_${HRCODE}
   set             BCDIR  = $EXPDIR/$OUTDIR/$BCNAME.scratch
   set             BCJOB  = $BCDIR/$BCNAME.j
-  set             THISGRID = ${EASEVERSION}-${HRCODE}
 
   set nfiles = `find $EXPDIR -maxdepth 5 -name ${BCNAME}".j" | wc -l`  
   if( $nfiles >= 1 ) then
@@ -1444,17 +1443,6 @@ cd data
 cd ../
 limit stacksize unlimited
 
-#if ( $EASEVERSION == EASEv2 ) then
-   ## This section was used to make Irrigated Tiles
-   ##if(${HRCODE} == M09 | ${HRCODE} == M36) then 
-   ##    bin/mkLandRaster.x -x ${NX} -y ${NY} -v -t ${NT}
-   ##    bin/mkEASETilesParam.x -ease_label ${HRCODE} -pfaf_til T
-   ##    bin/CombineRasters.x -f 0 -t 232000000 ${THISGRID} Pfafstetter > /dev/null
-   ##    bin/CombineRasters.x -t 232000000 ${THISGRID} ${THISGRID}-Pfafstetter
-   ##    /bin/mv til/${THISGRID}_${THISGRID}-Pfafstetter.til  til/${THISGRID}_${THISGRID}-Pfafstetter.ind 
-   ##endif
-#endif
-
 setenv MASKFILE ${MASKFILE}
 setenv OMP_NUM_THREADS 1
 bin/mkEASETilesParam.x -ease_label ${BCNAME} 
@@ -1468,7 +1456,6 @@ bin/create_README.csh
 
 /bin/mv clsm  clsm.${IM}x${JM}
 /bin/cp til/${EASEVERSION}_${HRCODE}_${RS}.til clsm.${IM}x${JM}
-##/bin/cp til//${THISGRID}_${THISGRID}-Pfafstetter.TIL clsm.${IM}x${JM}
 
 cd clsm.${IM}x${JM}
    /bin/mv irrig.dat irrigation_${RS}_DE.dat
@@ -1549,7 +1536,6 @@ mkdir -p $BCNAME/land/${EASEVERSION}_${HRCODE}
 
 #mkdir -p IRRIG/$BCNAME/clsm IRRIG/$BCNAME/rst
 #bin/mkIrrigTiles.x -x 43200 -y 21600 -b $BCNAME -t ${EASEVERSION}_${HRCODE}_${RS}.til -r _${RS}_DE -p $IRRIGTHRES
-#/bin/cp $BCNAME/${THISGRID}_${THISGRID}-Pfafstetter.TIL IRRIG/$BCNAME/.
 _EOF_
 
 

diff --git a/...mp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py b/...mp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py
@@ -231,7 +231,7 @@ def ask_questions(default_grid="Cubed-Sphere"):
             "name": "EASEv1",
             "message": "Select EASEv1 grid resolution: \n ",
             "choices": [ \
-                 "M01  --  1km $34668x14688$", \
+                 #"M01  --  1km $34668x14688$", \
                  "M03  --  3km $11556x4896$", \
                  "M09  --  9km  $3852x1632$", \
                  "M25  -- 25km  $1383x586$", \
@@ -243,7 +243,7 @@ def ask_questions(default_grid="Cubed-Sphere"):
             "name": "EASEv2",
             "message": "Select EASEv2 grid resolution: \n ",
             "choices": [ \
-                 "M01  --  1km $34704x14616$", \
+                 #"M01  --  1km $34704x14616$", \
                  "M03  --  3km $11568x4872$", \
                  "M09  --  9km  $3856x1624$", \
                  "M25  -- 25km  $1388x584$", \