Merge branch 'develop' into bugfix/borescan_elevation

Author: sdrabenh

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

@@ -53,39 +53,23 @@ def get_change_til_file(grid_type):
        script = """
 
 cd geometry/{GRIDNAME}/
-/bin/rm -f sedfile
 if( {TRIPOL_OCEAN} == True ) then
-cat > sedfile << EOF
-s/CF{NC}x6C/PE{nc}x{nc6}-CF/g
-s/{OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{OCEAN_VERSION}/g
-EOF
-sed -f sedfile       {GRIDNAME}{RS}.til > tile.file
-/bin/mv -f tile.file {GRIDNAME}{RS}.til
-/bin/rm -f sedfile
-ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
-ncatted -a Grid_ocn_Name,global,o,c,'PE{imo}x{jmo}-{OCEAN_VERSION}' {GRIDNAME}{RS}.nc4
+  sed -i 's/{OCEAN_VERSION}{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{OCEAN_VERSION}/g' {GRIDNAME}{RS}.til
+  sed -i 's/CF{NC}x6C/PE{nc}x{nc6}-CF/g' {GRIDNAME}{RS}.til
+  ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
+  ncatted -a Grid_ocn_Name,global,o,c,'PE{imo}x{jmo}-{OCEAN_VERSION}' {GRIDNAME}{RS}.nc4
 endif
 if( {CUBED_SPHERE_OCEAN} == True ) then
-cat > sedfile << EOF
-s/CF{NC}x6C{SGNAME}/PE{nc}x{nc6}-CF/g
-s/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/OC{nc}x{nc6}-CF/g
-EOF
-sed -f sedfile       {GRIDNAME}{RS}.til > tile.file
-/bin/mv -f tile.file {GRIDNAME}{RS}.til
-/bin/rm -f sedfile
-ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
-ncatted -a Grid_ocn_Name,global,o,c,'OC{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
+  sed -i 's/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/OC{nc}x{nc6}-CF/g' {GRIDNAME}{RS}.til
+  sed -i 's/CF{NC}x6C{SGNAME}/PE{nc}x{nc6}-CF/g' {GRIDNAME}{RS}.til
+  ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
+  ncatted -a Grid_ocn_Name,global,o,c,'OC{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
 endif
 if( {LATLON_OCEAN} == True ) then
-cat > sedfile << EOF
-s/CF{NC}x6C{SGNAME}/PE{nc}x{nc6}-CF/g
-s/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{DATENAME}/g
-EOF
-sed -f sedfile       {GRIDNAME}{RS}.til > tile.file
-/bin/mv -f tile.file {GRIDNAME}{RS}.til
-/bin/rm -f sedfile
-ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
-ncatted -a Grid_ocn_Name,global,o,c,'PE{imo}x{jmo}-{DATENAME}' {GRIDNAME}{RS}.nc4
+  sed -i 's/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{DATENAME}/g' {GRIDNAME}{RS}.til
+  sed -i 's/CF{NC}x6C{SGNAME}/PE{nc}x{nc6}-CF/g' {GRIDNAME}{RS}.til
+  ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
+  ncatted -a Grid_ocn_Name,global,o,c,'PE{imo}x{jmo}-{DATENAME}' {GRIDNAME}{RS}.nc4
 endif
 cd ../../
 
@@ -94,15 +78,9 @@ def get_change_til_file(grid_type):
 
      script = """
 cd geometry/{GRIDNAME}/
-/bin/rm -f sedfile
-cat > sedfile << EOF
-s/DC{IM}xPC{JM}/PC{im}x{jm}-DC/g
-s/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{DATENAME}/g
-EOF
-sed -f sedfile       {GRIDNAME}{RS}.til > tile.file
-/bin/mv -f tile.file {GRIDNAME}{RS}.til
-/bin/rm -f sedfile
-ncatted -a Grid_Name,global,o,c,'PE{nc}x{nc6}-CF' {GRIDNAME}{RS}.nc4
+sed -i 's/{DATENAME}{IMO}x{POLENAME}{JMO}-Pfafstetter/PE{imo}x{jmo}-{DATENAME}/g' {GRIDNAME}{RS}.til
+sed -i 's/DC{IM}xPC{JM}/PC{im}x{jm}-DC/g' {GRIDNAME}{RS}.til
+ncatted -a Grid_Name,global,o,c,'PC{im}x{jm}-DC' {GRIDNAME}{RS}.nc4
 ncatted -a Grid_ocn_Name,global,o,c,'PE{imo}x{jmo}-{DATENAME}' {GRIDNAME}{RS}.nc4
 cd ../../