diff --git a/scripts/exregional_make_grid.sh b/scripts/exregional_make_grid.sh index b2e42e96d..a1ac9c4f0 100755 --- a/scripts/exregional_make_grid.sh +++ b/scripts/exregional_make_grid.sh @@ -99,15 +99,18 @@ case $MACHINE in "WCOSS2") ulimit -s unlimited ulimit -a - ncores=$(( NNODES_MAKE_GRID*PPN_MAKE_GRID)) - APRUN="mpiexec -n ${ncores} -ppn ${PPN_MAKE_GRID}" + APRUN="time" ;; "HERA") + ulimit -s unlimited + ulimit -a APRUN="time" ;; "ORION") + ulimit -s unlimited + ulimit -a APRUN="time" ;; diff --git a/ush/set_gridparams_ESGgrid.sh b/ush/set_gridparams_ESGgrid.sh index 635c3ec7e..9474632a9 100644 --- a/ush/set_gridparams_ESGgrid.sh +++ b/ush/set_gridparams_ESGgrid.sh @@ -133,10 +133,10 @@ function set_gridparams_ESGgrid() { #----------------------------------------------------------------------- # del_angle_x_sg=$( bc -l <<< "(${delx}/(2.0*${radius_Earth}))*${degs_per_radian}" ) - del_angle_x_sg=$( printf "%0.10f\n" ${del_angle_x_sg} ) + del_angle_x_sg=$( printf "%0.17f\n" ${del_angle_x_sg} ) del_angle_y_sg=$( bc -l <<< "(${dely}/(2.0*${radius_Earth}))*${degs_per_radian}" ) - del_angle_y_sg=$( printf "%0.10f\n" ${del_angle_y_sg} ) + del_angle_y_sg=$( printf "%0.17f\n" ${del_angle_y_sg} ) neg_nx_of_dom_with_wide_halo=$( bc -l <<< "-($nx + 2*${halo_width})" ) neg_nx_of_dom_with_wide_halo=$( printf "%.0f\n" ${neg_nx_of_dom_with_wide_halo} )