[cig-commits] [commit] master: moved resource files to share directory. (db1b5c1)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Sat Jan 25 20:04:06 PST 2014
Repository : ssh://geoshell/relax
On branch : master
Link : https://github.com/geodynamics/relax/compare/bcedfef4ebfaccc1907e931abeec82e93d6b36b8...db1b5c1faa54651a122f7782d0b1f2b0d621ce8d
>---------------------------------------------------------------
commit db1b5c1faa54651a122f7782d0b1f2b0d621ce8d
Author: Sylvain Barbot <sbarbot at ntu.edu.sg>
Date: Fri Jan 10 12:48:24 2014 +0530
moved resource files to share directory.
>---------------------------------------------------------------
db1b5c1faa54651a122f7782d0b1f2b0d621ce8d
release/fink/readme.txt | 3 +++
release/fink/relax.info | 28 ++++++++++++++++++++--------
release/ports/readme.txt | 2 ++
release/ports/science/relax3d/Portfile | 16 ++++++++--------
util/flt2vtp.sh | 6 +++---
util/grd2vtp.sh | 12 ++++++------
util/grdmap.sh | 6 ++----
util/obsres.py | 2 +-
8 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/release/fink/readme.txt b/release/fink/readme.txt
index edad1e0..c170423 100644
--- a/release/fink/readme.txt
+++ b/release/fink/readme.txt
@@ -1,4 +1,7 @@
+# check input.f90 for the correct version number
+# update grdmap.sh to look for .cpt files in %p/share/gmt/cpt/
+
# make fink release source file
cd release/fink/
tar -cvzf relax-1.0.4.tar.gz relax-1.0.4
diff --git a/release/fink/relax.info b/release/fink/relax.info
index 7142b4b..3e7cfb4 100644
--- a/release/fink/relax.info
+++ b/release/fink/relax.info
@@ -1,28 +1,30 @@
Package: relax
-Version: 1.0.4
+Version: 1.0.5
Revision: 1
Source: http://www.geodynamics.org/cig/software/relax/fink/%n-%v.tar.gz
Maintainer: Sylvain Barbot <sbarbot at ntu.edu.sg>
HomePage: http://www.geodynamics.org/cig/software/relax/
License: GPL
Description: Semi-analytic solver for earthquake modeling
-Source-MD5: 11c517fe9060bc49f9db20d9d2744abd
+Source-MD5: 59747b5f9d1cac7ddfd71fad3707d662
Depends: <<
fftw3-shlibs,
- gcc47-shlibs,
+ gcc48-shlibs,
gmt-shlibs,
+ gv,
netcdf-c7-shlibs,
- proj-shlibs
+ proj-shlibs,
+ python27
<<
BuildDepends: <<
fftw3,
- gcc47,
+ gcc48,
gmt,
gmt-dev,
netcdf-c7,
proj
<<
-DocFiles: COPYING INSTALL relax.tex
+DocFiles: COPYING INSTALL
CompileScript: <<
#! /bin/sh -ev
./waf configure --use-fftw --fftw-dir=%p --proj-dir=%p --gmt-dir=%p
@@ -31,7 +33,17 @@ CompileScript: <<
InstallScript: <<
#! /bin/sh -ev
/usr/bin/install -d -m 755 %i/bin
-/usr/bin/install -m 755 ./build/relax %i/bin/relax
+/usr/bin/install -m 755 ./build/relax %i/bin/relax
+/usr/bin/install -m 755 ./util/erpatch.sh %i/bin/erpatch.sh
+/usr/bin/install -m 755 ./util/flt2vtp.sh %i/bin/flt2vtp.sh
+/usr/bin/install -m 755 ./util/grdmap.sh %i/bin/grdmap.sh
+/usr/bin/install -m 755 ./util/grd2vtp.sh %i/bin/grd2vtp.sh
+/usr/bin/install -m 755 ./util/obsrelax.sh %i/bin/obsrelax.sh
+/usr/bin/install -m 755 ./util/obsres.py %i/bin/obsres.py
+/usr/bin/install -m 755 ./util/seg2flt.py %i/bin/seg2flt.py
/usr/bin/install -d -m 755 %i/share/man/man1
-/usr/bin/install -m 644 ./man/man1/relax.1 %i/share/man/man1/relax.1
+/usr/bin/install -m 644 ./man/man1/relax.1 %i/share/man/man1/relax.1
+/usr/bin/install -d -m 755 %i/share/gmt/cpt
+/usr/bin/install -m 644 ./share/jet.cpt %i/share/gmt/cpt/RELAX_jet.cpt
+/usr/bin/install -m 644 ./share/anatolia.cpt %i/share/gmt/cpt/RELAX_anatolia.cpt
<<
diff --git a/release/ports/readme.txt b/release/ports/readme.txt
index 70aa126..211d473 100644
--- a/release/ports/readme.txt
+++ b/release/ports/readme.txt
@@ -1,4 +1,6 @@
+# check out input.f90 for the correct version number
+
# make macports release source file
cd release/ports/
tar -cvjf relax3d-1.0.4.tar.bz2 relax3d-1.0.4
diff --git a/release/ports/science/relax3d/Portfile b/release/ports/science/relax3d/Portfile
index 793c81a..dcc23a7 100644
--- a/release/ports/science/relax3d/Portfile
+++ b/release/ports/science/relax3d/Portfile
@@ -1,11 +1,11 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
+# $Id: Portfile 109198 2013-08-09 22:09:15Z macsforever2000 at macports.org $
PortSystem 1.0
PortGroup active_variants 1.1
name relax3d
-version 1.0.4
+version 1.0.5
categories science gis
platforms darwin
license GPL
@@ -22,12 +22,12 @@ homepage http://www.geodynamics.org/cig/software/relax/
master_sites http://www.geodynamics.org/cig/software/relax/macports
use_bzip2 yes
-checksums rmd160 ed82d798758783657f54cd6d5cc6f274fa381793 \
- sha256 1b5dd4914256a39c6fb64bc2fd29215f8f0d188c57a057c4c5fcc06a4068e0a9
+checksums rmd160 7f62d09c95691208c14ff3756d3dd230cd38458b \
+ sha256 232039a3bc8c9d2eb58292906484a8ee4550e178388f8e42f8bc9abd29d6487b
depends_lib-append port:fftw-3-single \
port:gmt4 \
- port:proj47 \
+ port:proj48 \
port:python27
# gmt4 is not universal
@@ -38,7 +38,7 @@ configure.ldflags-append "-L${prefix}/lib -lfftw3 -lfftw3_threads -lfftw3f -lff
configure.args --use-fftw \
--fftw-dir=${prefix} \
--proj-incdir=${prefix}/include \
- --proj-libdir=${prefix}/lib/proj47/lib \
+ --proj-libdir=${prefix}/lib/proj48/lib \
--gmt-dir=${prefix}/lib/gmt4
configure.cmd "./waf configure"
@@ -71,6 +71,6 @@ variant gcc48 conflicts gcc45 gcc46 gcc47 description {Compile with gcc 4.8} {
require_active_variants fftw-3-single gcc48
}
-if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48]} {
- default_variants +gcc47
+if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
+ default_variants +gcc48
}
diff --git a/util/flt2vtp.sh b/util/flt2vtp.sh
index dc493b2..c5567ea 100755
--- a/util/flt2vtp.sh
+++ b/util/flt2vtp.sh
@@ -4,7 +4,7 @@ set -e
self=$(basename $0)
trap 'echo $self: Some errors occurred. Exiting.; exit' ERR
-flt2vtk(){
+flt2vtp(){
grep -v "#" $FLTFILE | awk '
BEGIN{
pi=atan2(1,0)*2;
@@ -113,7 +113,7 @@ fi
if [ ! -t 0 ]; then
FLTFILE=-
VTKFILE=/dev/stdout
- flt2vtk
+ flt2vtp
else
# loop over list of files to convert
while [ $# -ne 0 ];do
@@ -125,7 +125,7 @@ else
exit 2
fi
echo $self: converting $1 to $VTKFILE
- flt2vtk
+ flt2vtp
shift
done
fi
diff --git a/util/grd2vtp.sh b/util/grd2vtp.sh
index 7cdacba..53a34f9 100755
--- a/util/grd2vtp.sh
+++ b/util/grd2vtp.sh
@@ -4,7 +4,7 @@ set -e
self=$(basename $0)
trap 'echo $self: Some errors occurred. Exiting.; exit' ERR
-grd2vtk_header(){
+grd2vtp_header(){
SX1=`grdinfo -C $GRDFILE | awk '{print $10}'`
SX2=`grdinfo -C $GRDFILE | awk '{print $11}'`
N=`echo $SX1 $SX2 | awk '{print $1*$2}'`
@@ -36,7 +36,7 @@ grd2vtk_header(){
echo "POINT_DATA $N"
}
-grd2vtk_footer(){
+grd2vtp_footer(){
TITLE=`grdinfo -C $GRDFILE | awk '{print $1}'`
echo "SCALARS $(basename $TITLE .grd) float"
echo "LOOKUP_TABLE default"
@@ -46,7 +46,7 @@ grd2vtk_footer(){
usage(){
- echo "$self converts a list of grd files to a vtk polygon polydata file"
+ echo "$self converts a list of grd files to a vtp polygon polydata file"
echo "in ASCII legacy format for visualization in Paraview."
echo ""
echo "usage: $self file.grd > file.vtp"
@@ -92,8 +92,8 @@ if [ "$dset" != "1" ]; then
fi
GRDFILE=$1
-grd2vtk_header
-grd2vtk_footer
+grd2vtp_header
+grd2vtp_footer
shift
# loop over list of files to convert
@@ -103,7 +103,7 @@ while [ $# -ne 0 ];do
echo $self: could not find $GRDFILE. exiting. >&2
exit 2
fi
- grd2vtk_footer
+ grd2vtp_footer
shift
done
diff --git a/util/grdmap.sh b/util/grdmap.sh
index d3520f4..4ecb036 100755
--- a/util/grdmap.sh
+++ b/util/grdmap.sh
@@ -136,7 +136,7 @@ gmtset COLOR_FOREGROUND 255/0/0
gmtset COLOR_NAN 255/255/255
gmtset PAPER_MEDIA archA
-libdir=$(dirname $0)
+libdir=$(dirname $0)/../share
EXTRA=""
while getopts "b:c:e:ghi:o:p:v:s:t:T:u:xrC:E:J:Y:" flag
@@ -188,9 +188,7 @@ fi
# color scale
if [ "$cset" != "-c" ]; then
- #cptfile=hot
- cptfile=$libdir/my_jet
- #cptfile=$libdir/my_hot_inv
+ cptfile=$libdir/jet
else
if [ -e "$libdir/$carg" ]; then
cptfile=$libdir/$carg
diff --git a/util/obsres.py b/util/obsres.py
index f7a742a..3867d73 100755
--- a/util/obsres.py
+++ b/util/obsres.py
@@ -1,4 +1,4 @@
-#!/sw/bin/python
+#!/usr/bin/env python
# computes the norm of the residuals between relax prediction and GPS time series
More information about the CIG-COMMITS
mailing list