Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Gyacomo
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Antoine Cyril David Hoffmann
Gyacomo
Commits
195f57a8
Commit
195f57a8
authored
2 years ago
by
Antoine Cyril David Hoffmann
Browse files
Options
Downloads
Patches
Plain Diff
small renamings and gitignore changes
parent
fa11381b
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitignore
+2
-1
2 additions, 1 deletion
.gitignore
Makefile
+3
-3
3 additions, 3 deletions
Makefile
local/dirs.inc
+1
-1
1 addition, 1 deletion
local/dirs.inc
wk/analysis_gyacomo.m
+16
-11
16 additions, 11 deletions
wk/analysis_gyacomo.m
with
22 additions
and
16 deletions
.gitignore
+
2
−
1
View file @
195f57a8
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
*.emf
*.emf
*.pptx
*.pptx
*.jpg
*.jpg
*.gif
*.jpeg
*.jpeg
*.mat
*.mat
*.dat
*.dat
...
@@ -34,10 +35,10 @@ iCa/
...
@@ -34,10 +35,10 @@ iCa/
*.out
*.out
src/srcinfo.h
src/srcinfo.h
src/srcinfo/srcinfo.h
src/srcinfo/srcinfo.h
*/fort*.90
local/
local/
*/*.sh
*/*.sh
Gallery/
Gallery/
.vscode/settings.json
.vscode/settings.json
*figure*
*figure*
*results*
*results*
out*
This diff is collapsed.
Click to expand it.
Makefile
+
3
−
3
View file @
195f57a8
include
local/dirs.inc
include
local/dirs.inc
include
local/make.inc
include
local/make.inc
EXEC
=
$(
BINDIR
)
/
helaz3
EXEC
=
$(
BINDIR
)
/
gyacomo
EFST
=
$(
BINDIR
)
/
helaz3
_fst
EFST
=
$(
BINDIR
)
/
gyacomo
_fst
EDBG
=
$(
BINDIR
)
/
helaz3
_dbg
EDBG
=
$(
BINDIR
)
/
gyacomo
_dbg
F90
=
mpiifort
F90
=
mpiifort
# #F90 = ftn #for piz-daint cluster
# #F90 = ftn #for piz-daint cluster
...
...
This diff is collapsed.
Click to expand it.
local/dirs.inc
+
1
−
1
View file @
195f57a8
#Local code, binaries, pputils library
#Local code, binaries, pputils library
PREFIX
=
$
(
HOME
)
/
HeLaZ
PREFIX
=
$
(
HOME
)
/
gyacomo
SRCDIR
=
$
(
PREFIX
)
/
src
SRCDIR
=
$
(
PREFIX
)
/
src
BINDIR
=
$
(
PREFIX
)
/
bin
BINDIR
=
$
(
PREFIX
)
/
bin
OBJDIR
=
$
(
PREFIX
)
/
obj
OBJDIR
=
$
(
PREFIX
)
/
obj
...
...
This diff is collapsed.
Click to expand it.
wk/analysis_
HeLaZ
.m
→
wk/analysis_
gyacomo
.m
+
16
−
11
View file @
195f57a8
addpath
(
genpath
([
helazdir
,
'matlab'
]))
% ... add
%% UNCOMMENT FOR TUTORIAL
addpath
(
genpath
([
helazdir
,
'matlab/plot'
]))
% ... add
% gyacomodir = pwd; gyacomodir = gyacomodir(1:end-2); % get code directory
addpath
(
genpath
([
helazdir
,
'matlab/compute'
]))
% ... add
% resdir = '.'; %Name of the directory where the results are located
addpath
(
genpath
([
helazdir
,
'matlab/load'
]))
% ... add
% JOBNUMMIN = 00; JOBNUMMAX = 10;
%%
addpath
(
genpath
([
gyacomodir
,
'matlab'
]))
% ... add
addpath
(
genpath
([
gyacomodir
,
'matlab/plot'
]))
% ... add
addpath
(
genpath
([
gyacomodir
,
'matlab/compute'
]))
% ... add
addpath
(
genpath
([
gyacomodir
,
'matlab/load'
]))
% ... add
%% Load the results
%% Load the results
LOCALDIR
=
[
helaz
dir
,
'
res
ults/'
,
outfile
,
'/'
];
LOCALDIR
=
[
gyacomo
dir
,
res
dir
,
'/'
];
MISCDIR
=
[
'/misc/
HeLaZ
_outputs/res
ults/'
,
outfile
,
'/'
];
MISCDIR
=
[
'/misc/
gyacomo
_outputs/
'
,
res
dir
,
'/'
];
%For long term storage
system
([
'mkdir -p '
,
MISCDIR
]);
system
([
'mkdir -p '
,
MISCDIR
]);
system
([
'mkdir -p '
,
LOCALDIR
]);
system
([
'mkdir -p '
,
LOCALDIR
]);
CMD
=
[
'rsync '
,
LOCALDIR
,
'outputs* '
,
MISCDIR
];
disp
(
CMD
);
CMD
=
[
'rsync '
,
LOCALDIR
,
'outputs* '
,
MISCDIR
];
disp
(
CMD
);
...
@@ -28,8 +33,8 @@ options.TAVG_1 = 1000;%0.9*data.Ts3D(end); % Averaging times duration
...
@@ -28,8 +33,8 @@ options.TAVG_1 = 1000;%0.9*data.Ts3D(end); % Averaging times duration
options
.
NCUT
=
4
;
% Number of cuts for averaging and error estimation
options
.
NCUT
=
4
;
% Number of cuts for averaging and error estimation
options
.
NMVA
=
1
;
% Moving average for time traces
options
.
NMVA
=
1
;
% Moving average for time traces
% options.ST_FIELD = '\Gamma_x'; % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
% options.ST_FIELD = '\Gamma_x'; % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
options
.
ST_FIELD
=
'\phi'
;
% chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
%
options.ST_FIELD = '\phi'; % chose your field to plot in spacetime diag (e.g \phi,v_x,G_x)
options
.
INTERP
=
1
;
%
options.INTERP = 1;
fig
=
plot_radial_transport_and_spacetime
(
data
,
options
);
fig
=
plot_radial_transport_and_spacetime
(
data
,
options
);
save_figure
(
data
,
fig
,
'.png'
)
save_figure
(
data
,
fig
,
'.png'
)
end
end
...
@@ -45,8 +50,8 @@ if 0
...
@@ -45,8 +50,8 @@ if 0
% Options
% Options
options
.
INTERP
=
1
;
options
.
INTERP
=
1
;
options
.
POLARPLOT
=
0
;
options
.
POLARPLOT
=
0
;
options
.
NAME
=
'\phi'
;
%
options.NAME = '\phi';
%
options.NAME = 'N_i^{00}';
options
.
NAME
=
'N_i^{00}'
;
% options.NAME = 'v_y';
% options.NAME = 'v_y';
% options.NAME = 'n_i^{NZ}';
% options.NAME = 'n_i^{NZ}';
% options.NAME = '\Gamma_x';
% options.NAME = '\Gamma_x';
...
@@ -57,7 +62,7 @@ options.PLAN = 'xy';
...
@@ -57,7 +62,7 @@ options.PLAN = 'xy';
options
.
COMP
=
'avg'
;
options
.
COMP
=
'avg'
;
% options.TIME = data.Ts5D(end-30:end);
% options.TIME = data.Ts5D(end-30:end);
% options.TIME = data.Ts3D;
% options.TIME = data.Ts3D;
options
.
TIME
=
[
1
:
0.2
:
500
];
options
.
TIME
=
[
0
:
500
];
data
.
EPS
=
0.1
;
data
.
EPS
=
0.1
;
data
.
a
=
data
.
EPS
*
2000
;
data
.
a
=
data
.
EPS
*
2000
;
create_film
(
data
,
options
,
'.gif'
)
create_film
(
data
,
options
,
'.gif'
)
...
...
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