Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Summa Actors
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Numerical_Simulations_Lab
Actors
Summa Actors
Commits
e0688835
Commit
e0688835
authored
2 years ago
by
Kyle
Browse files
Options
Downloads
Patches
Plain Diff
removed sundials calls from old makefile
parent
18c3655b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
build/makefile_old_summa
+5
-10
5 additions, 10 deletions
build/makefile_old_summa
with
5 additions
and
10 deletions
build/makefile_old_summa
+
5
−
10
View file @
e0688835
...
@@ -5,17 +5,12 @@ ROOT_DIR = /Summa-Actors
...
@@ -5,17 +5,12 @@ ROOT_DIR = /Summa-Actors
FC = gfortran # Fortran
FC = gfortran # Fortran
CC = g++ # C++
CC = g++ # C++
DIR_SUNDIALS=/code/sundials/instdir
INC_SUNDIALS=-I$(DIR_SUNDIALS)/include -I$(DIR_SUNDIALS)/fortran
LIB_SUNDIALS=-L$(DIR_SUNDIALS)/lib -lsundials_fnvecmanyvector_mod -lsundials_fida_mod -lsundials_fnvecserial_mod -lsundials_fsunlinsoldense_mod -lsundials_fsunmatrixdense_mod
#### Includes AND Libraries ####
#### Includes AND Libraries ####
INCLUDES = -I/usr/include -I/usr/local/include
$(INC_SUNDIALS)
INCLUDES = -I/usr/include -I/usr/local/include
LIBRARIES = -L/usr/lib -L/usr/local/lib -lnetcdff -lopenblas
$(LIB_SUNDIALS)
LIBRARIES = -L/usr/lib -L/usr/local/lib -lnetcdff -lopenblas
ACTORS_INCLUDES = -I/usr/include -I/usr/local/include
$(INC_SUNDIALS)
ACTORS_INCLUDES = -I/usr/include -I/usr/local/include
ACTORS_LIBRARIES = -L/usr/lib -L/usr/local/lib -L/Summa-Actors/bin -lcaf_core -lcaf_io -lsumma -lopenblas -lnetcdff
$(LIB_SUNDIALS)
ACTORS_LIBRARIES = -L/usr/lib -L/usr/local/lib -L/Summa-Actors/bin -lcaf_core -lcaf_io -lsumma -lopenblas -lnetcdff
# Production runs
# Production runs
...
@@ -408,7 +403,7 @@ compile_main:
...
@@ -408,7 +403,7 @@ compile_main:
$(CC) $(FLAGS_ACTORS) -c $(MAIN) $(GLOBAL_INCLUDES) $(SUMMA_ACTOR_INCLUDES) $(JOB_ACTOR_INCLUDES)
$(CC) $(FLAGS_ACTORS) -c $(MAIN) $(GLOBAL_INCLUDES) $(SUMMA_ACTOR_INCLUDES) $(JOB_ACTOR_INCLUDES)
link_cpp:
link_cpp:
$(CC) $(FLAGS_ACTORS) -Wl,-rpath='/Summa-Actors/bin:/usr/local/lib
:/code/sundials/instdir/lib
' -o summaMain *.o $(ACTORS_LIBRARIES)
$(CC) $(FLAGS_ACTORS) -Wl,-rpath='/Summa-Actors/bin:/usr/local/lib' -o summaMain *.o $(ACTORS_LIBRARIES)
mv summaMain $(ROOT_DIR)/bin
mv summaMain $(ROOT_DIR)/bin
clean_cpp:
clean_cpp:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment