Skip to content

Commit

Permalink
Changes to support OCONUS domains and chgres cube on WCOSS
Browse files Browse the repository at this point in the history
  • Loading branch information
Benjamin.Blake EMC authored and Benjamin.Blake EMC committed Oct 3, 2019
1 parent 2fa0424 commit b3d781c
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 21 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local_path = sorc/regional_utils.fd
required = True

[nemsfv3gfs]
branch = develop
branch = master
protocol = git
repo_url = gerrit:NEMSfv3gfs
local_path = sorc/regional_forecast.fd
Expand Down
12 changes: 6 additions & 6 deletions rocoto/sites/wcoss_cray.ent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@

<!ENTITY GET_INPUT_RESOURCES "<cores>1</cores><walltime>03:00:00</walltime>">

<!ENTITY MAKE_IC_RESOURCES "<nodes>1:ppn=1:tpp=1</nodes><envar><name>TOTAL_TASKS</name><value>1</value></envar><envar><name>NCTSK</name><value>1</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:15:00</walltime>">
<!ENTITY MAKE_IC_RESOURCES "<nodes>4:ppn=4:tpp=1</nodes><envar><name>TOTAL_TASKS</name><value>16</value></envar><envar><name>NCTSK</name><value>4</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:15:00</walltime>">

<!ENTITY MAKE_BC_RESOURCES "<nodes>20:ppn=1:tpp=1</nodes><envar><name>TOTAL_TASKS</name><value>20</value></envar><envar><name>NCTSK</name><value>1</value></envar><envar><name>OMP_THREADS</name><value>24</value></envar><walltime>00:30:00</walltime>">
<!ENTITY MAKE_BC_RESOURCES "<nodes>4:ppn=4:tpp=1</nodes><envar><name>TOTAL_TASKS</name><value>16</value></envar><envar><name>NCTSK</name><value>4</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:50:00</walltime>">

<!-- some of these are domain specific -->
<!ENTITY FORECAST_EXTRA "<envar><name>NCTSK</name><value>12</value></envar><envar><name>OMP_THREADS</name><value>2</value></envar><walltime>02:40:00</walltime>">
<!ENTITY FORECAST_TM00_RESOURCES_hi "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_hi "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar><envar><name>TASK_X</name><value>6</value></envar><envar><name>TASK_Y</name><value>10</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_conus "<nodes>76:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>912</value></envar><envar><name>TASK_X</name><value>16</value></envar><envar><name>TASK_Y</name><value>48</value></envar><envar><name>WG</name><value>3</value></envar><envar><name>WTPG</name><value>48</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_ak "<nodes>60:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>720</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_pr "<nodes>9:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>108</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_guam "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_ak "<nodes>60:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>720</value></envar><envar><name>TASK_X</name><value>14</value></envar><envar><name>TASK_Y</name><value>48</value></envar><envar><name>WG</name><value>2</value></envar><envar><name>WTPG</name><value>24</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_pr "<nodes>9:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>108</value></envar><envar><name>TASK_X</name><value>8</value></envar><envar><name>TASK_Y</name><value>12</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_guam "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar> <envar><name>TASK_X</name><value>6</value></envar><envar><name>TASK_Y</name><value>10</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">

<!ENTITY POST_EXTRA "<envar><name>NCTSK</name><value>24</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:20:00</walltime>">
<!ENTITY POST_RESOURCES_conus "<nodes>3:ppn=24</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar>&POST_EXTRA;">
Expand Down
11 changes: 6 additions & 5 deletions rocoto/sites/wcoss_dell_p3.ent
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@

<!ENTITY MAKE_IC_RESOURCES "<nodes>1:ppn=1:tpp=24</nodes><envar><name>TOTAL_TASKS</name><value>24</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:30:00</walltime><native>-R affinity[core]</native>">

<!ENTITY MAKE_BC_RESOURCES "<nodes>20:ppn=1</nodes><envar><name>TOTAL_TASKS</name><value>480</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:30:00</walltime><native>-R affinity[core]</native>">
<!ENTITY MAKE_BC_RESOURCES "<nodes>1:ppn=1:tpp=24</nodes><envar><name>TOTAL_TASKS</name><value>24</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>01:30:00</walltime><native>-R affinity[core]</native>">

<!ENTITY FORECAST_EXTRA "<envar><name>NCTSK</name><value>12</value></envar><envar><name>OMP_THREADS</name><value>2</value></envar><walltime>01:30:00</walltime><native>-R affinity[core\(2\):distribute=balance]</native>">
<!ENTITY FORECAST_TM00_RESOURCES_conus "<nodes>76:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>912</value></envar><envar><name>TASK_X</name><value>16</value></envar><envar><name>TASK_Y</name><value>48</value></envar><envar><name>WG</name><value>3</value></envar><envar><name>WTPG</name><value>48</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_ak "<nodes>60:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>720</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_hi "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_pr "<nodes>9:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>108</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_guam "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_ak "<nodes>60:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>720</value></envar><envar><name>TASK_X</name><value>14</value></envar><envar><name>TASK_Y</name><value>48</value></envar><envar><name>WG</name><value>2</value></envar><envar><name>WTPG</name><value>24</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_pr "<nodes>9:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>108</value></envar><envar><name>TASK_X</name><value>8</value></envar><envar><name>TASK_Y</name><value>12</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_guam "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar> <envar><name>TASK_X</name><value>6</value></envar><envar><name>TASK_Y</name><value>10</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">
<!ENTITY FORECAST_TM00_RESOURCES_hi "<nodes>6:ppn=12:tpp=2</nodes><envar><name>TOTAL_TASKS</name><value>72</value></envar><envar><name>TASK_X</name><value>6</value></envar><envar><name>TASK_Y</name><value>10</value></envar><envar><name>WG</name><value>1</value></envar><envar><name>WTPG</name><value>12</value></envar>&FORECAST_EXTRA;">


<!ENTITY POST_EXTRA "<envar><name>NCTSK</name><value>14</value></envar><envar><name>OMP_THREADS</name><value>1</value></envar><walltime>00:20:00</walltime><native>-R affinity[core]</native>">
<!ENTITY POST_RESOURCES_conus "<nodes>2:ppn=14</nodes><envar><name>TOTAL_TASKS</name><value>28</value></envar>&POST_EXTRA;">
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_make_bc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ cat <<EOF >fort.41
/
EOF

time ${APRUNC} -l ./regional_chgres_cube.x
time ${APRUNC} ./regional_chgres_cube.x
hour=`expr $hour + $hour_inc`

#
Expand Down
2 changes: 1 addition & 1 deletion scripts/exregional_make_ic.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ cat <<EOF >fort.41
/
EOF

time ${APRUNC} -l ./regional_chgres_cube.x
time ${APRUNC} ./regional_chgres_cube.x

#
# move output files to save directory
Expand Down
7 changes: 1 addition & 6 deletions sorc/link_fix.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ set -xeu

source ./machine-setup.sh > /dev/null 2>&1

LINK="ln -sf"
if [[ $# -ge 1 ]]; then
if [[ $1 = "nco" ]]; then
LINK="cp -rp"
fi
fi
LINK="cp -rp"

pwd=$(pwd -P)

Expand Down
2 changes: 1 addition & 1 deletion ush/run_commands_bc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ "$machine" = wcoss_cray ]; then
elif [ "$machine" = wcoss_dell_p3 ]; then
export APRUNS=${APRUNS:-"time"}
export APRUNF=${APRUNF:-"mpirun cfp"}
export APRUNC=${APRUNC:-"time"}
export APRUNC=${APRUNC:-"mpirun"}
export APRUNO="time"
export BACKGROUND=""
elif [ "$machine" = hera ]; then
Expand Down

0 comments on commit b3d781c

Please sign in to comment.