Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
D
Detection eddies
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container 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
IPSL
LMD
DPAO
Detection eddies
Commits
c9c7b858
Commit
c9c7b858
authored
3 years ago
by
Lionel GUEZ
Browse files
Options
Downloads
Patches
Plain Diff
Polish
parent
3bd5ee90
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Convert_Matlab/inst_eddies_v6.py
+1
-1
1 addition, 1 deletion
Convert_Matlab/inst_eddies_v6.py
Overlap/eddy_graph.f90
+1
-0
1 addition, 0 deletions
Overlap/eddy_graph.f90
with
2 additions
and
1 deletion
Convert_Matlab/inst_eddies_v6.py
+
1
−
1
View file @
c9c7b858
...
@@ -5,7 +5,7 @@ SHPC_anti and SHPC_cyclo. The mat files are assumed to be in v7.3
...
@@ -5,7 +5,7 @@ SHPC_anti and SHPC_cyclo. The mat files are assumed to be in v7.3
(HDF5) format and will be converted to v6 format, launching Matlab,
(HDF5) format and will be converted to v6 format, launching Matlab,
before being read in Python. The data in each input file is the set of
before being read in Python. The data in each input file is the set of
detected instantaneous eddies at a given date. The second, optional,
detected instantaneous eddies at a given date. The second, optional,
argument of this script is the final date processed. The script
argument of this script is the final date processed. The
Matlab
script
inst_eddies.m must be in the current directory at run-time.
inst_eddies.m must be in the current directory at run-time.
"""
"""
...
...
This diff is collapsed.
Click to expand it.
Overlap/eddy_graph.f90
+
1
−
0
View file @
c9c7b858
...
@@ -105,6 +105,7 @@ program eddy_graph
...
@@ -105,6 +105,7 @@ program eddy_graph
if
(
n_dates
==
huge
(
0
))
&
if
(
n_dates
==
huge
(
0
))
&
n_dates
=
sum
([(
size
(
hshp
(
i
)
%
ishape_last
),
i
=
1
,
n_shpc
)])
n_dates
=
sum
([(
size
(
hshp
(
i
)
%
ishape_last
),
i
=
1
,
n_shpc
)])
print
*
,
"n_dates = "
,
n_dates
call
assert
(
n_dates
>=
max_delta
+
1
,
&
call
assert
(
n_dates
>=
max_delta
+
1
,
&
"eddy_graph: n_dates should be >= max_delta + 1"
)
"eddy_graph: n_dates should be >= max_delta + 1"
)
call
assert
(
n_proc
<=
n_dates
/
(
max_delta
+
1
),
&
call
assert
(
n_proc
<=
n_dates
/
(
max_delta
+
1
),
&
...
...
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