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

Commit 22e2231

Browse files
author
Mei-Hui Su
committed
update example scripts sed calls
1 parent d394322 commit 22e2231

7 files changed

Lines changed: 12 additions & 6 deletions

File tree

COPYING

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
License
22
=======
33

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

272-
Copyright 2014 Southern California Earthquake Center and the
272+
Copyright 2019 Southern California Earthquake Center and the
273273
University of Southern California
274274

275275
Licensed under the Apache License, Version 2.0 (the "License");

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11

2+
2019-06-01 Mei-Hui Su <mei@usc.edu>
3+
4+
* Added z-range to plotting capability for external elygtl
5+
26
2019-04-15 Mei-Hui Su <mei@usc.edu>
37

48
* Added new plotting capability of using elevation in addition to depth

aclocal.m4

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1037,3 +1037,4 @@ AC_SUBST([am__tar])
10371037
AC_SUBST([am__untar])
10381038
]) # _AM_PROG_TAR
10391039

1040+
m4_include([m4/AX_PROG_CC_MPI.m4])

examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ SCRATCH=./scratch
2222
cp ${BIN_DIR}/ucvm2mesh_mpi .
2323
cp ${CONF_DIR}/ucvm.conf .
2424

25-
sed 's ${SCRATCH} '$SCRATCH' ' small_cvmh.conf_template > small_cvmh.conf
25+
sed 's ${CONF_DIR} '$CONF_DIR' ' small_cvmh.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > small_cvmh.conf
2626

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

examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ SCRATCH=./scratch
2222
cp ${BIN_DIR}/ucvm2mesh_mpi .
2323
cp ${CONF_DIR}/ucvm.conf .
2424

25-
sed 's ${SCRATCH} '$SCRATCH' ' small_cvmsi.conf_template > small_cvmsi.conf
25+
sed 's ${CONF_DIR} '$CONF_DIR' ' small_cvmsi.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > small_cvmsi.conf
26+
2627

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

examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rm -rf la_habra_cvms.grid la_habra_cvms.media la_habra_cvms.conf ucvm2mesh_mpi_l
2222
cp ${BIN_DIR}/ucvm2mesh_mpi_layer .
2323
cp ${CONF_DIR}/ucvm.conf .
2424

25-
sed 's ${SCRATCH} '$SCRATCH' ' la_habra_cvms.conf_template > la_habra_cvms.conf
25+
sed 's ${CONF_DIR} '$CONF_DIR' ' la_habra_cvms.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > la_habra_cvms.conf
2626

2727
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
2828
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

examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ rm -rf la_habra_cvmsi.grid la_habra_cvmsi.media la_habra_cvmsi.conf ucvm2mesh_mp
2222
cp ${BIN_DIR}/ucvm2mesh_mpi_layer .
2323
cp ${CONF_DIR}/ucvm.conf .
2424

25-
sed 's ${SCRATCH} '$SCRATCH' ' la_habra_cvmsi.conf_template > la_habra_cvmsi.conf
25+
sed 's ${CONF_DIR} '$CONF_DIR' ' la_habra_cvmsi.conf_template | sed 's ${SCRATCH} '$SCRATCH' ' > la_habra_cvmsi.conf
2626

2727
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
2828
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

0 commit comments

Comments
 (0)