Skip to content
This repository has been archived by the owner on Feb 8, 2022. It is now read-only.

Commit

Permalink
update example scripts sed calls
Browse files Browse the repository at this point in the history
  • Loading branch information
Mei-Hui Su committed May 31, 2019
1 parent d394322 commit 22e2231
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
License
=======

Copyright (c)2014 Southern California Earthquake Center (SCEC) and the
Copyright (c)2019 Southern California Earthquake Center (SCEC) and the
University of Southern California (USC). This copyright applies to the UCVM
codebase as a whole, or any individual distributed applications. The
individual contributions of government employees, which may be identified
Expand Down Expand Up @@ -269,7 +269,7 @@ Apache 2.0 License
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2014 Southern California Earthquake Center and the
Copyright 2019 Southern California Earthquake Center and the
University of Southern California

Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

2019-06-01 Mei-Hui Su <[email protected]>

* Added z-range to plotting capability for external elygtl

2019-04-15 Mei-Hui Su <[email protected]>

* Added new plotting capability of using elevation in addition to depth
Expand Down
1 change: 1 addition & 0 deletions aclocal.m4
Original file line number Diff line number Diff line change
Expand Up @@ -1037,3 +1037,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR

m4_include([m4/AX_PROG_CC_MPI.m4])
2 changes: 1 addition & 1 deletion examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ SCRATCH=./scratch
cp ${BIN_DIR}/ucvm2mesh_mpi .
cp ${CONF_DIR}/ucvm.conf .

sed 's ${SCRATCH} '$SCRATCH' ' small_cvmh.conf_template > small_cvmh.conf
sed 's ${CONF_DIR} '$CONF_DIR' ' small_cvmh.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > small_cvmh.conf

salloc -N 2 --ntasks=2 --time=00:20:00 srun --ntasks=2 -v --mpi=pmi2 ./ucvm2mesh_mpi -f small_cvmh.conf

Expand Down
3 changes: 2 additions & 1 deletion examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ SCRATCH=./scratch
cp ${BIN_DIR}/ucvm2mesh_mpi .
cp ${CONF_DIR}/ucvm.conf .

sed 's ${SCRATCH} '$SCRATCH' ' small_cvmsi.conf_template > small_cvmsi.conf
sed 's ${CONF_DIR} '$CONF_DIR' ' small_cvmsi.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > small_cvmsi.conf


salloc -N 4 --ntasks=8 --time=00:30:00 srun --ntasks=8 -v --mpi=pmi2 ${BIN_DIR}/ucvm2mesh_mpi -f small_cvmsi.conf

Expand Down
2 changes: 1 addition & 1 deletion examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rm -rf la_habra_cvms.grid la_habra_cvms.media la_habra_cvms.conf ucvm2mesh_mpi_l
cp ${BIN_DIR}/ucvm2mesh_mpi_layer .
cp ${CONF_DIR}/ucvm.conf .

sed 's ${SCRATCH} '$SCRATCH' ' la_habra_cvms.conf_template > la_habra_cvms.conf
sed 's ${CONF_DIR} '$CONF_DIR' ' la_habra_cvms.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > la_habra_cvms.conf

salloc -N 2 --ntasks=4 --time=00:30:00 srun --ntasks=4 -v --mpi=pmi2 ./ucvm2mesh_mpi_layer -f la_habra_cvms.conf -l 1 -c 3
salloc --ntasks=4 --time=00:30:00 srun --ntasks=4 -v --mpi=pmi2 ./ucvm2mesh_mpi_layer -f la_habra_cvms.conf -l 4 -c 3
Expand Down
2 changes: 1 addition & 1 deletion examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ rm -rf la_habra_cvmsi.grid la_habra_cvmsi.media la_habra_cvmsi.conf ucvm2mesh_mp
cp ${BIN_DIR}/ucvm2mesh_mpi_layer .
cp ${CONF_DIR}/ucvm.conf .

sed 's ${SCRATCH} '$SCRATCH' ' la_habra_cvmsi.conf_template > la_habra_cvmsi.conf
sed 's ${CONF_DIR} '$CONF_DIR' ' la_habra_cvmsi.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > la_habra_cvmsi.conf

salloc -N 2 --ntasks=4 --time=00:30:00 srun --ntasks=4 -v --mpi=pmi2 ./ucvm2mesh_mpi_layer -f la_habra_cvmsi.conf -l 1 -c 3
salloc --ntasks=4 --time=00:30:00 srun --ntasks=4 -v --mpi=pmi2 ./ucvm2mesh_mpi_layer -f la_habra_cvmsi.conf -l 4 -c 3
Expand Down

0 comments on commit 22e2231

Please sign in to comment.