Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Méso-NH code
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Méso-NH
Méso-NH code
Commits
31724fc9
Commit
31724fc9
authored
4 months ago
by
PIANEZZE Joris
Browse files
Options
Downloads
Patches
Plain Diff
Add parallel compilation for toy model
parent
22a81951
No related branches found
No related tags found
1 merge request
!1
Add parallel compilation for toy model + typo in Makefile for OASIS's compilation
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/LIB/toy_2.0.tar.gz
+2
-2
2 additions, 2 deletions
src/LIB/toy_2.0.tar.gz
src/Makefile
+3
-3
3 additions, 3 deletions
src/Makefile
src/Makefile.MESONH.mk
+2
-2
2 additions, 2 deletions
src/Makefile.MESONH.mk
with
7 additions
and
7 deletions
src/LIB/toy_2.0.tar.gz
LFS
+
2
−
2
View file @
31724fc9
No preview for this file type
This diff is collapsed.
Click to expand it.
src/Makefile
+
3
−
3
View file @
31724fc9
...
...
@@ -385,11 +385,11 @@ endif
ifeq
"$(VER_OASIS)" "OASISAUTO"
#
ifeq
"$(VER_CDF)" "CDFAUTO"
$(OASIS_
KEY
)
:
$(CDF_MOD)
$(OASIS_
MOD
)
:
$(CDF_MOD)
endif
#
oasis
:
$(OASIS_
KEY
)
$(OASIS_
KEY
)
:
oasis
:
$(OASIS_
MOD
)
$(OASIS_
MOD
)
:
cd
${
SRC_MESONH
}
/src/LIB/oasis3-mct_
${
VERSION_OASIS
}
/util/make_dir
&&
\
$(
MAKE
)
-f
TopMakefileOasis3 makedirs-static makemct-static makescrip-static makepsmile-static
&&
\
cd
${
SRC_MESONH
}
/src/LIB/toy_
${
VERSION_TOY
}
&&
\
...
...
This diff is collapsed.
Click to expand it.
src/Makefile.MESONH.mk
+
2
−
2
View file @
31724fc9
...
...
@@ -474,7 +474,7 @@ endif
#
ifeq
"$(VER_OASIS)" "OASISAUTO"
OASIS_PATH
?=
${
OBJDIR_MASTER
}
/OASIS3-MCT_5.0
OASIS_
KEY
?=
${
OASIS_PATH
}
/build/lib/psmile.MPI1/mod_oasis.mod
OASIS_
MOD
?=
${
OASIS_PATH
}
/build/lib/psmile.MPI1/mod_oasis.mod
# INC_OASIS : includes all *o and *mod for each library
INC_OASIS
?=
-I
${
OASIS_PATH
}
/build/lib/psmile.MPI1
-I
$(
OASIS_PATH
)
/build/lib/mct
-I
$(
OASIS_PATH
)
/build/lib/scrip
LIB_OASIS
?=
-L
${
OASIS_PATH
}
/lib
-lpsmile
.MPI1
-lmct
-lmpeu
-lscrip
...
...
@@ -490,7 +490,7 @@ ifndef OASISDIR
$(
error
You have chosen
VER_OASIS
=
OASISPERSO, please
set
OASISDIR environment variable
)
endif
OASIS_PATH
?=
${
OASISDIR
}
OASIS_
KEY
?=
${
OASIS_PATH
}
/build/lib/psmile.MPI1/mod_oasis.mod
OASIS_
MOD
?=
${
OASIS_PATH
}
/build/lib/psmile.MPI1/mod_oasis.mod
# INC_OASIS : includes all *o and *mod for each library
INC_OASIS
?=
-I
${
OASIS_PATH
}
/build/lib/psmile.MPI1
-I
$(
OASIS_PATH
)
/build/lib/mct
-I
$(
OASIS_PATH
)
/build/lib/scrip
LIB_OASIS
?=
-L
${
OASIS_PATH
}
/lib
-lpsmile
.MPI1
-lmct
-lmpeu
-lscrip
...
...
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