Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Adding merge_evc and epsilon #8

Merged
merged 4 commits into from
Oct 5, 2022
Merged

Adding merge_evc and epsilon #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f24d1cb
adding merge_evc and epsilon to the repo
degennar Oct 5, 2022
220659f
Add a make all procedure
elinscott Oct 5, 2022
b28157e
Change gh action to attempt make all instead of just make kcp
elinscott Oct 5, 2022
da305ce
Correct comment in PP/Makefile
elinscott Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/make.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ jobs:
./configure MPIF90=mpif90
- name: Build
run: |
make kcp
make all

11 changes: 9 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,21 @@ PREFIX ?= /usr/local
default :
@echo 'to install, type at the shell prompt:'
@echo ' ./configure'
@echo ' make kcp'
@echo ' make all'
@echo ' make install'

all : kcp pp

kcp : bindir mods libs libiotk afclib
if test -d CPV ; then \
( cd CPV ; if test "$(MAKE)" = "" ; then make $(MFLAGS) TLDEPS= kcp ; \
else $(MAKE) $(MFLAGS) TLDEPS= kcp ; fi ) ; fi

pp : bindir
if test -d PP ; then \
( cd PP ; if test "$(MAKE)" = "" ; then make $(MFLAGS) TLDEPS= all ; \
else $(MAKE) $(MFLAGS) TLDEPS= all ; fi ) ; fi

libiotk :
if test -d iotk ; then \
( cd iotk ; if test "$(MAKE)" = "" ; then make $(MFLAGS) TLDEPS= lib+util ; \
Expand Down Expand Up @@ -40,7 +47,7 @@ bindir :
clean :
touch make.sys
for dir in \
CPV Modules clib flib iotk AFC90 \
CPV PP Modules clib flib iotk AFC90 \
; do \
if test -d $$dir ; then \
( cd $$dir ; \
Expand Down
21 changes: 21 additions & 0 deletions PP/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Makefile for post-processing utilities

include ../make.sys

#MODULES = $(PWOBJS) $(QEMODS)

all: merge_evc.x

merge_evc.x: merge_evc.o
$(LD) $(LDFLAGS) -o $@ merge_evc.o
- ( cd ../bin ; ln -fs ../PP/$@ . )

#epsilon.x: epsilon.o $(MODULES) $(LIBOBJS)
# $(LD) $(LDFLAGS) -o $@ epsilon.o $(MODULES) \
# $(LIBOBJS) $(QELIBS)
# - ( cd ../bin ; ln -fs ../src/$@ . )

clean:
- /bin/rm -f *.x *.o *~ *_tmp.f90 *.d *.mod *.i *.L *genmod*

include make.depend
Loading