From 22e22318229bc4c9be99e6d6ba9c2fb858b799d4 Mon Sep 17 00:00:00 2001 From: Mei-Hui Su Date: Fri, 31 May 2019 14:39:35 -0700 Subject: [PATCH] update example scripts sed calls --- COPYING | 4 ++-- ChangeLog | 4 ++++ aclocal.m4 | 1 + examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh | 2 +- examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh | 3 ++- examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh | 2 +- examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/COPYING b/COPYING index aece0a1..58d68b9 100644 --- a/COPYING +++ b/COPYING @@ -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 @@ -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"); diff --git a/ChangeLog b/ChangeLog index 953e49c..6664025 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ +2019-06-01 Mei-Hui Su + +* Added z-range to plotting capability for external elygtl + 2019-04-15 Mei-Hui Su * Added new plotting capability of using elevation in addition to depth diff --git a/aclocal.m4 b/aclocal.m4 index f6192c7..5f63dde 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1037,3 +1037,4 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR +m4_include([m4/AX_PROG_CC_MPI.m4]) diff --git a/examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh b/examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh index dbb0cfb..152c777 100755 --- a/examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh +++ b/examples/programs/mesh/run_ucvm2mesh_mpi_cvmh.sh @@ -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 diff --git a/examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh b/examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh index dc1af12..beab025 100755 --- a/examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh +++ b/examples/programs/mesh/run_ucvm2mesh_mpi_cvmsi.sh @@ -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 diff --git a/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh b/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh index 99e8b70..27a5e58 100755 --- a/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh +++ b/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvms.sh @@ -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 diff --git a/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh b/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh index 827ccd1..60596ae 100755 --- a/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh +++ b/examples/programs/mesh/run_ucvm2mesh_mpi_layer_cvmsi.sh @@ -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