From 63d4ee9fa0a4485851467eebb733716aadcc49dc Mon Sep 17 00:00:00 2001 From: Randy LeVeque Date: Wed, 31 Jul 2013 10:00:51 -0700 Subject: [PATCH] changed environment variable CLAWUTIL to CLAW/clawutil --- src/Makefile.common | 6 +++--- src/python/clawutil/runclaw.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Makefile.common b/src/Makefile.common index 3ab07cc..906f952 100644 --- a/src/Makefile.common +++ b/src/Makefile.common @@ -128,7 +128,7 @@ debug: #---------------------------------------------------------------------------- # Command to create *.html files from *.f etc: -CC2HTML = $(CLAW_PYTHON) $(CLAWUTIL)/src/python/clawutil/clawcode2html.py --force +CC2HTML = $(CLAW_PYTHON) $(CLAW)/clawutil/src/python/clawutil/clawcode2html.py --force # make list of html files to be created by 'make .htmls': HTML = \ @@ -179,7 +179,7 @@ data: $(MAKEFILE_LIST); # Run the code without checking dependencies: output: $(MAKEFILE_LIST); -rm -f .output - $(CLAW_PYTHON) $(CLAWUTIL)/src/python/clawutil/runclaw.py $(EXE) $(OUTDIR) \ + $(CLAW_PYTHON) $(CLAW)/clawutil/src/python/clawutil/runclaw.py $(EXE) $(OUTDIR) \ $(OVERWRITE) $(RESTART) . $(GIT_STATUS) @echo $(OUTDIR) > .output @@ -189,7 +189,7 @@ output: $(MAKEFILE_LIST); # (Removed Cygwin stuff...) # Plotting command -PLOTCMD ?= $(CLAW_PYTHON) $(VISCLAW)/src/python/visclaw/plotclaw.py +PLOTCMD ?= $(CLAW_PYTHON) $(CLAW)/visclaw/src/python/visclaw/plotclaw.py # Rule to make the plots into subdirectory specified by PLOTDIR, # using data in subdirectory specified by OUTDIR and the plotting diff --git a/src/python/clawutil/runclaw.py b/src/python/clawutil/runclaw.py index 163ee7e..34ff61f 100755 --- a/src/python/clawutil/runclaw.py +++ b/src/python/clawutil/runclaw.py @@ -4,7 +4,7 @@ Generic code for running the fortran version of Clawpack and sending the results to subdirectory output of the directory from which this is executed. Execute via - $ python $CLAWUTIL/src/python/clawutil/runclaw.py + $ python $CLAW/clawutil/src/python/clawutil/runclaw.py from a directory that contains a claw.data file and a Clawpack executable. """