Skip to content

Commit

Permalink
Merge pull request #7 from mmoschetti-usgs/master
Browse files Browse the repository at this point in the history 
promoting script fixes
  • Loading branch information
@pmpowers-usgs
pmpowers-usgs committed Feb 10, 2015
2 parents bae80cc + 223c0f7 commit 2ef924f
Show file tree
Hide file tree
Showing 147 changed files with 4,277 additions and 1,531 deletions.
6 changes: 6 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
bin
*.o
logs
out
scripts/junk
scripts/dir_hazrun_old/
scripts/log_wus.tmp
scripts/run_haz_interactive.sh
Binary file added CA_hazCurves/CA-1Hz-ALL-0p05.curves
View file
Binary file not shown.
Binary file added CA_hazCurves/CA-5Hz-ALL-0p05.curves
View file
Binary file not shown.
Binary file added CA_hazCurves/CA-PGA-ALL-0p05.curves
View file
Binary file not shown.
15 changes: 5 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,29 +8,24 @@

.PHONY: all clean

#m_bit=-m32 # flag does not work on Linux cluster
#m_bit=-m32 # flag does not work on Linux cluster
m_bit=

#F_COMPILER = gfortran
F_COMPILER = gfortran
F_COMPILER2 = ifort
FFLAGS1 = -O2 -Warray-bounds -ffixed-line-length-none -ffpe-trap= -fbounds-check $(m_bit)
FFLAGS1 = -Warray-bounds -ffixed-line-length-none -ffpe-trap= -fbounds-check $(LDLIBS)
FFLAGS1_I = -132
#FFLAGS2 = $(FFLAGS1) -fcray-pointer $(m_bit)
FFLAGS2 = $(FFLAGS1) $(m_bit)

C_COMPILER = gcc
CFLAGS = -O $(m_bit)
#CFLAGS = -O $(m_bit)
CFLAGS =

OUT = bin
SRC = src
UTIL = $(SRC)/util


#all: CreateBinDir hazallXL.v2 hazallXL.v4 hazFXnga7c hazFXnga13l hazgridXnga5 hazgridXnga13l hazSUBXnga hazSUBXngatest hazpoint hazinterpnga avg_dist fltrate.v2 get_avalue gethead.nga getmeanrjf getmeanrjf.v2 gutenberg
#all: CreateBinDir hazallXL.v2 hazallXL.v4 hazallXL.v5 hazFXnga13l hazgridXnga13l hazSUBXnga hazSUBXngatest hazpoint hazinterpnga avg_dist fltrate.v2 get_avalue gethead.nga getmeanrjf getmeanrjf.v2 gutenberg
#all: CreateBinDir hazallXL.v2 hazallXL.v4 hazFXnga13l hazgridXnga13l hazSUBXnga hazSUBXngatest hazpoint hazinterpnga avg_dist fltrate.v2 get_avalue gethead.nga getmeanrjf getmeanrjf.v2 gutenberg
all: CreateBinDir hazallXL.v2 hazallXL.v4 hazFXnga13l hazgridXnga13l hazSUBX hazpoint hazinterpnga avg_dist fltrate.v2 get_avalue gethead.nga getmeanrjf getmeanrjf.v2 gutenberg assim.2013
all: CreateBinDir hazallXL.v2 hazallXL.v4 hazFXnga13l hazgridXnga13l hazSUBX hazpoint hazinterpnga avg_dist fltrate.v2 get_avalue gethead.nga getmeanrjf.v2 gutenberg assim.2013

CreateBinDir:
mkdir -p $(OUT)
Expand Down
1 change: 1 addition & 0 deletions conf/CEUS/gridded/ERM-S1_RLME_2014.770.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
../out/ERM-S1_RLME_2014.770.pga
20
.005 .007 .0098 .0137 .0192 .0269 .0376 .0527 .0738 .103 .145 .203 .284 .397 .556 .778 1.09 1.52 2.2 3.3
9
2 0.11 500. 0.00 1 Toro Mw atten.
7 0.10 500. 0.00 0 somerville
6 0.06 500. 0.16 0 FEA
Expand Down
4 changes: 4 additions & 0 deletions conf/combine/ceus.1.resample
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
1
760.
../out/combine/tmp.ceus.5hz
../out/combine/ceus.5hz
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.1hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.1hz.m
1
../out/2014WUSbird.char.1hz.m
0.667
../out/2014WUSbird.gr.1hz.m
0.333
../out/zonesPB.1hz.m
1
1
../out/combine/wus_flts_bird.1hz.m
0
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.1hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.1hz.p
1
../out/2014WUSbird.char.1hz.p
0.667
../out/2014WUSbird.gr.1hz.p
0.333
../out/zonesPB.1hz.p
1
1
../out/combine/wus_flts_bird.1hz.p
0
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.5hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.5hz.m
1
../out/2014WUSbird.char.5hz.m
0.667
../out/2014WUSbird.gr.5hz.m
0.333
../out/zonesPB.5hz.m
1
1
../out/combine/wus_flts_bird.5hz.m
0
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.5hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.5hz.p
1
../out/2014WUSbird.char.5hz.p
0.667
../out/2014WUSbird.gr.5hz.p
0.333
../out/zonesPB.5hz.p
1
1
../out/combine/wus_flts_bird.5hz.p
0
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.pga.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.pga.m
1
../out/2014WUSbird.char.pga.m
0.667
../out/2014WUSbird.gr.pga.m
0.333
../out/zonesPB.pga.m
1
1
../out/combine/wus_flts_bird.pga.m
0
13 changes: 13 additions & 0 deletions conf/combine/combine_Bird.pga.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
1
4
../out/2014WUSbird.65.pga.p
1
../out/2014WUSbird.char.pga.p
0.667
../out/2014WUSbird.gr.pga.p
0.333
../out/zonesPB.pga.p
1
1
../out/combine/wus_flts_bird.pga.p
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.1hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.1hz.m
1
../out/2014WUSzeng.char.1hz.m
0.667
../out/2014WUSzeng.gr.1hz.m
0.333
1
../out/combine/wus_flts_zeng.1hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.1hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.1hz.p
1
../out/2014WUSzeng.char.1hz.p
0.667
../out/2014WUSzeng.gr.1hz.p
0.333
1
../out/combine/wus_flts_zeng.1hz.p
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.5hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.5hz.m
1
../out/2014WUSzeng.char.5hz.m
0.667
../out/2014WUSzeng.gr.5hz.m
0.333
1
../out/combine/wus_flts_zeng.5hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.5hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.5hz.p
1
../out/2014WUSzeng.char.5hz.p
0.667
../out/2014WUSzeng.gr.5hz.p
0.333
1
../out/combine/wus_flts_zeng.5hz.p
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.pga.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.pga.m
1
../out/2014WUSzeng.char.pga.m
0.667
../out/2014WUSzeng.gr.pga.m
0.333
1
../out/combine/wus_flts_zeng.pga.m
0
11 changes: 11 additions & 0 deletions conf/combine/combine_Zeng.pga.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/2014WUSzeng.65.pga.p
1
../out/2014WUSzeng.char.pga.p
0.667
../out/2014WUSzeng.gr.pga.p
0.333
1
../out/combine/wus_flts_zeng.pga.p
0
11 changes: 11 additions & 0 deletions conf/combine/shear.1hz.epimerge
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/combine/shear.1hz
0.63
../out/combine/shear.1hz.p
0.185
../out/combine/shear.1hz.m
0.185
1
../out/combine/shear_epimerge.1hz
0
11 changes: 11 additions & 0 deletions conf/combine/shear.5hz.epimerge
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/combine/shear.5hz
0.63
../out/combine/shear.5hz.p
0.185
../out/combine/shear.5hz.m
0.185
1
../out/combine/shear_epimerge.5hz
0
11 changes: 11 additions & 0 deletions conf/combine/shear.pga.epimerge
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3
../out/combine/shear.pga
0.63
../out/combine/shear.pga.p
0.185
../out/combine/shear.pga.m
0.185
1
../out/combine/shear_epimerge.pga
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.1hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.1hz.m
1
../out/shear3_2014.1hz.m
1
../out/shear4_2014.1hz.m
1
1
../out/combine/tmp.shear.1hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.1hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.1hz.p
1
../out/shear3_2014.1hz.p
1
../out/shear4_2014.1hz.p
1
1
../out/combine/tmp.shear.1hz.p
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.5hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.5hz.m
1
../out/shear3_2014.5hz.m
1
../out/shear4_2014.5hz.m
1
1
../out/combine/tmp.shear.5hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.5hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.5hz.p
1
../out/shear3_2014.5hz.p
1
../out/shear4_2014.5hz.p
1
1
../out/combine/tmp.shear.5hz.p
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.pga.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.pga.m
1
../out/shear3_2014.pga.m
1
../out/shear4_2014.pga.m
1
1
../out/combine/tmp.shear.pga.m
0
11 changes: 11 additions & 0 deletions conf/combine/shear_zones.g.pga.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1
3 number of files
../out/shear2_2014.pga.p
1
../out/shear3_2014.pga.p
1
../out/shear4_2014.pga.p
1
1
../out/combine/tmp.shear.pga.p
0
2 changes: 1 addition & 1 deletion conf/combine/us_hazard_curves.1hz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
1
../out/combine/wus_2014_epimerge.g.1hz
1
../out/CA-1Hz-ALL-0p05.curves
../CA_hazCurves/CA-1Hz-ALL-0p05.curves
1
1
../out/combine/us_epimerge.1hz
Expand Down
2 changes: 1 addition & 1 deletion conf/combine/us_hazard_curves.5hz
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
1
../out/combine/wus_2014_epimerge.g.5hz
1
../out/CA-5Hz-ALL-0p05.curves
../CA_hazCurves/CA-5Hz-ALL-0p05.curves
1
1
../out/combine/us_epimerge.5hz
Expand Down
2 changes: 1 addition & 1 deletion conf/combine/us_hazard_curves.pga
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
1
../out/combine/wus_2014_epimerge.g.pga
1
../out/CA-PGA-ALL-0p05.curves
../CA_hazCurves/CA-PGA-ALL-0p05.curves
1
1
../out/combine/us_epimerge.pga
Expand Down
11 changes: 11 additions & 0 deletions conf/combine/wus_2014.f.1hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1 !use hazallXL.v2
3
../out/combine/wus_flts_bird.1hz.m
0.1
../out/combine/wus_flts_zeng.1hz.m
0.1
../out/combine/wus_flts_geo.1hz.m
0.8
1
../out/combine/wus_2014.f.1hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/wus_2014.f.1hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1 !use hazallXL.v2
3
../out/combine/wus_flts_bird.1hz.p
0.1
../out/combine/wus_flts_zeng.1hz.p
0.1
../out/combine/wus_flts_geo.1hz.p
0.8
1
../out/combine/wus_2014.f.1hz.p
0
11 changes: 11 additions & 0 deletions conf/combine/wus_2014.f.5hz.m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1 !use hazallXL.v2
3
../out/combine/wus_flts_bird.5hz.m
0.1
../out/combine/wus_flts_zeng.5hz.m
0.1
../out/combine/wus_flts_geo.5hz.m
0.8
1
../out/combine/wus_2014.f.5hz.m
0
11 changes: 11 additions & 0 deletions conf/combine/wus_2014.f.5hz.p
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
1 !use hazallXL.v2
3
../out/combine/wus_flts_bird.5hz.p
0.1
../out/combine/wus_flts_zeng.5hz.p
0.1
../out/combine/wus_flts_geo.5hz.p
0.8
1
../out/combine/wus_2014.f.5hz.p
0
Loading

0 comments on commit 2ef924f

Please sign in to comment.