Made filenames consistent

sanatcumar · Nov 16, 2023 · 76dd01a · 76dd01a
1 parent 6e18c0f
commit 76dd01a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ush/fv3gfs_ocean_merge.sh b/ush/fv3gfs_ocean_merge.sh
@@ -39,5 +39,5 @@ EOF
     ncks -A -v lake_frac,lake_depth ${TEMP_DIR}/ocean_merged/C${res}.mx${ocn}/C${res}.mx${ocn}.tile${tnum}.nc out.oro.nc
     #cp out.oro.nc $out_dir/oro_C${res}.mx${ocn}.tile${tnum}.nc
     cp out.oro.nc $orog_dir/oro.C${res}.tile${tnum}.nc
-    cp C${res}_grid.tile${tnum}.nc $out_dir/C${res}_grid.tile${tnum}.nc
+    #cp C${res}_grid.tile${tnum}.nc $out_dir/C${res}_grid.tile${tnum}.nc
     done
diff --git a/ush/sfc_climo_gen.sh b/ush/sfc_climo_gen.sh
@@ -69,9 +69,9 @@ if [[ $GRIDTYPE == "nest" ]] || [[ $GRIDTYPE == "regional" ]] ; then
   the_orog_files='"C'${res}'_oro_data.tile7.nc"'
 else
 	if declare -p ocn &>/dev/null;then	
-  		the_orog_files='"oro_C'${res}.mx${ocn}'.tile1.nc","oro_C'${res}.mx${ocn}'.tile2.nc","oro_C'${res}.mx${ocn}'.tile3.nc","oro_C'${res}.mx${ocn}'.tile4.nc","oro_C'${res}.mx${ocn}'.tile5.nc","oro_C'${res}.mx${ocn}'.tile6.nc"'
+		the_orog_files='"C'${res}.mx${ocn}'_oro_data.tile1.nc","C'${res}.mx${ocn}'_oro_data.tile2.nc","C'${res}.mx${ocn}'_oro_data.tile3.nc","C'${res}.mx${ocn}'_oro_data.tile4.nc","C'${res}.mx${ocn}'_oro_data.tile5.nc","C'${res}.mx${ocn}'_oro_data.tile6.nc"'
 	else
-		the_orog_files='"oro_C'${res}'.tile1.nc","oro_C'${res}'.tile2.nc","oro_C'${res}'.tile3.nc","oro_C'${res}'.tile4.nc","oro_C'${res}'.tile5.nc","oro_C'${res}'.tile6.nc"'
+		the_orog_files='"C'${res}'_oro_data.tile1.nc","C'${res}'_oro_data.tile2.nc","C'${res}'_oro_data.tile3.nc","C'${res}'_oro_data.tile4.nc","C'${res}'_oro_data.tile5.nc","C'${res}'_oro_data.tile6.nc"'
 	fi
 fi
 #the_orog_files='"C'${res}'_oro_data.tile1.nc","C'${res}'_oro_data.tile2.nc","C'${res}'_oro_data.tile3.nc","C'${res}'_oro_data.tile4.nc","C'${res}'_oro_data.tile5.nc","C'${res}'_oro_data.tile6.nc"'