Skip to content
This repository has been archived by the owner on Oct 23, 2020. It is now read-only.

ALL CORES: Moving executable from src/ to the mpas root. #9

Merged
merged 3 commits into from
May 2, 2013
Merged

ALL CORES: Moving executable from src/ to the mpas root. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
201df2a
Moving executable from src/ to the mpas root.
douglasjacobsen May 1, 2013
c840b3d
Fixing clean targets in Makefiles.
douglasjacobsen May 2, 2013
ca96068
Updating makefile to move executable if it's built
douglasjacobsen May 2, 2013
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,15 @@ mpas_main:
CPPINCLUDES="$(CPPINCLUDES)" \
FCINCLUDES="$(FCINCLUDES)" \
CORE="$(CORE)"
if [ ! -e $(CORE)_model.exe ]; then ln -s src/$(CORE)_model.exe .; fi
if [ -e src/$(CORE)_model ]; then mv src/$(CORE)_model .; fi
@echo ""
@echo $(DEBUG_MESSAGE)
@echo $(SERIAL_MESSAGE)
@echo $(PAPI_MESSAGE)
@echo $(TAU_MESSAGE)
clean:
cd src; $(MAKE) clean RM="$(RM)" CORE="$(CORE)"
$(RM) $(CORE)_model.exe
$(RM) $(CORE)_model
error: errmsg

else # CORE IF
Expand Down
4 changes: 2 additions & 2 deletions src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ else
all: mpas

mpas: reg_includes externals frame ops dycore drver
$(LINKER) $(LDFLAGS) -o $(CORE)_model.exe driver/*.o -L. -ldycore -lops -lframework $(LIBS) -I./external/esmf_time_f90 -L./external/esmf_time_f90 -lesmf_time
$(LINKER) $(LDFLAGS) -o $(CORE)_model driver/*.o -L. -ldycore -lops -lframework $(LIBS) -I./external/esmf_time_f90 -L./external/esmf_time_f90 -lesmf_time

externals: reg_includes
( cd external; $(MAKE) FC="$(FC)" SFC="$(SFC)" CC="$(CC)" SCC="$(SCC)" FFLAGS="$(FFLAGS)" CFLAGS="$(CFLAGS)" CPP="$(CPP)" NETCDF="$(NETCDF)" CORE="$(CORE)" )
Expand All @@ -38,7 +38,7 @@ dycore: reg_includes externals frame ops


clean:
$(RM) $(CORE)_model.exe libframework.a libops.a libdycore.a lib$(CORE).a *.o
$(RM) libframework.a libops.a libdycore.a lib$(CORE).a *.o
( cd registry; $(MAKE) clean )
( cd external; $(MAKE) clean )
( cd framework; $(MAKE) clean )
Expand Down