- Sep 12, 2024
-
-
GUEZ Lionel authored
Invert order of dummy arguments of procedure `read_grid`.
-
GUEZ Lionel authored
-
GUEZ Lionel authored
Use `uniform_lon_lat` from modules `input_ssh_m` or `read_grid_m` to compute actual argument of `shpc_create`.
-
GUEZ Lionel authored
In program `test_read_eddy`.
-
GUEZ Lionel authored
Replace dummy argument `grid_lon_lat` of procedure `shpc_create` by `with_proj`.
-
GUEZ Lionel authored
Specify whether to read shapefile `extr_proj` in procedure `shpc_open` instead of just trying to read this shapefile. Use `uniform_lon_lat` to decide whether to read the shapefile. As `shpc_open` is called in both programs `inst_eddies` and `eddy_graph`, we cannot access variable `uniform_lon_lat` of module `input_ssh_m`, which is not used in program `eddy_graph`, nor variable `uniform_lon_lat` of module `read_grid_m`, which is not used in program `inst_eddies`. So we add a dummy argument `with_proj` to procedure `shpc_open`.
-
- Jan 25, 2023
-
-
Lionel GUEZ authored
-
Lionel GUEZ authored
-
Lionel GUEZ authored
We will need this new shapefile in program `eddy_graph` only for a non longitude-latitude grid. We add a new dummy argument `grid_lon_lat` to procedure `shpc_create` to decide whether we create the shapefile `extr_proj`.
-
- Jul 27, 2022
-
-
Lionel GUEZ authored
Assume that a slice is in a directory "{shpc_dir}/{orientation}/Slice_{slice}" where shpc_dir can be any name, orientation is "Anticyclones" or "Cyclones" and slice is an integer. Do not read or create any longer a file "orientation.txt" in the slice directory. Add procedure `get_slice_dir`. Add dummy arguments cyclone and slice to procedure `shpc_open`. Add dummy argument slice to procedure `shpc_create`.
-
Lionel GUEZ authored
-
Lionel GUEZ authored
Define two variables `hshp_in` and `hshp_out` to avoid aliases in arguments of `shpc_create`. I have encountered a run which crashed there.
-
- Jul 26, 2022
-
-
Lionel GUEZ authored
Split derived type `shpc_slice_handler` into `shpc_slice_handler` and `shpc_slice_meta out`. Do not mix what is necessary to open, create and close, analogous to a logical unit, with what comes from reading the files.
-
Lionel GUEZ authored
Create component `unit` for `ishape_last.txt` in derived type `shpc_slice_handler`. Open, create and close `ishape_last.txt` at the same time we open, create and close the shapefiles. So we use `read_opcol` instead of `read_column` when we need to read `ishape_last.txt`.
-
Lionel GUEZ authored
-
- Jul 25, 2022
-
-
Lionel GUEZ authored
We are more clearly separating opening files and reading from them.
-
- Jan 08, 2022
-
-
Lionel GUEZ authored
-
Lionel GUEZ authored
Read name of input SHPC for program `test_read_eddy` from the command line.
-
Lionel GUEZ authored
-
- Jan 04, 2022
-
-
Lionel GUEZ authored
It was confusing to mix opening an SHPC with broadcasting some part of the resulting shpc variable.
-
- Jul 19, 2021
-
-
Lionel GUEZ authored
Because now there is a case when we want to open in appending mode: in program `inst_eddies`.
-
Lionel GUEZ authored
Thanks to commit 5ff9e1d2, we are reverting in part commits e1aa5bcc and 338dd393.
-
- Jun 22, 2021
-
-
Lionel GUEZ authored
-
Lionel GUEZ authored
We now impose that all eddies in an SHPC have the same orientation. Remove field `extr_cycl` from the derived type shpc and add field cyclone to shpc. When reading an eddy, give it the orientation of its SHPC. Add argument cyclone to procedure `shpc_create`. Create a file `orientation.txt` in each SHPC. When writing an eddy, check that its orientation matches that of the SHPC.
-
Lionel GUEZ authored
Rename triplet to collection, `shp_tr` to shpc, shpt to shpc in comments, identifiers and file names.
-
- Jun 15, 2021
-
-
Lionel GUEZ authored
-
Lionel GUEZ authored
-
- Feb 26, 2021
-
-
Lionel GUEZ authored
Also split the tests, Fortran source files, Python files and JSon files. Keep at the top level the files used in both `Inst_eddies` and Overlap. Motivations for the split: - The top directory contained many files. - It may be useful to compile only one of the two sub-projects. For example, only `Inst_eddies` on Ciclad, where MPI 3 is not available.
-
- Apr 16, 2020
-
-
GUEZ Lionel authored
Rename files and identifiers: change `"shp_triplet"` to `"shp_tr"`.
-
GUEZ Lionel authored
Add dummy argument `shp_triplet_dir` to procedure `shp_triplet_create`. Motivation: program `eddy_graph` needs to create one SHP triplet per MPI process.
-
GUEZ Lionel authored
-
GUEZ Lionel authored
Rename procedure `init_shapefiles` to `shp_triplet_create`.
-
GUEZ Lionel authored
-
- Apr 15, 2020
-
-
GUEZ Lionel authored
Create derived type `shp_triplet`. Motivation: we need to manipulate two triplets of shapefiles in program `eddy_graph`. Use everywhere a variable of type `shp_triplet` instead of the three variables `hshp_extremum`, `hshp_outermost`, `hshp_max_speed` when all three of them appear. Rename character variable `shp_triplet` to `shp_triplet_dir`.
-
- Mar 05, 2020
-
-
Lionel GUEZ authored
Prepare for a run of `test_get_snapshot` which receives a snapshot. Generalize main unit `test_get_snapshot`: it is now parallelized; it reads a date index from stdin; it sends a snapshot from process 1 to process 0 if it is run with 2 processes. The logic of the overlap program will be that all processes access the triplet of input shapefiles. So modify subroutine `read_field_indices`: process 0 reads field indices and broadcasts them. This implies that programs `test_overlap`, `test_read_snapshot` and `test_read_eddy` use MPI. Generalize `algorithm.py`. In program `test_send_recv`, read input SHP triplet from command line instead of requiring it to be present in the current directory with the name `SHP_triplet_old`. Generalize `test_send_recv`: read `ishape_last` from file. In `test_send_recv`, all processes must now access the triplet of shapefiles since process 0 reads field indices. For the sake of uniformity, read and broadcast k1 from process 0.
-
- Sep 24, 2019
-
-
Lionel GUEZ authored
Use `SHP_triplet` instead of Snapshot for the name of the directory containing the three shapefiles extremum, `outermost_contour` and `max_speed_contour`. This is meant as a general name, analogous to a new file type. Generally, the shapefiles may contain eddies at different dates, not just a snapshot.
-
- Aug 21, 2019
-
-
Lionel GUEZ authored
Move dummy arguments k and i of procedure `write_eddy` to the end of dummy argument list: keyword association more likely for these. Follow upgrade of `Shapelib_03`: move argument associated to dummy argument hshp of `shp_open_03` to the beginning of argument list.
-
- May 13, 2019
-
-
Lionel GUEZ authored
files, that make up a snapshot into a directory that contains only these files. We hope that this will ease the handling of snapshots. For now, this is useful in program test_successive_overlap. So, in program extraction_eddies, create the shapefiles in a directory called Snapshot. As we cannot create the directory from Fortran (in Fortran 2003, it becomes possible in Fortran 2008), we have to wrap the Fortran executable in a shell script "extraction_eddies.sh". In the same way, read from a directory Snapshot_old in programs test_read_eddy and test_read_snapshot and create scripts "test_read_eddy.sh" and "test_read_snapshot.sh". Reference the shell scripts "extraction_eddies.sh", "test_read_eddy.sh" and "test_read_snapshot.sh" in JSON test files. In program test_successive_overlap, finally read two snapshots, from directories Snapshot_1 and Snapshot_2. Pass to successive_overlap the date of the second snapshot. Use new variables corner_deg and step_deg to avoid converting to rad twice. Create directory Snapshot in Tests/Input/Region_4/2006_01_01.
-
- Apr 03, 2019
-
-
Lionel GUEZ authored
-
- Feb 28, 2019
-
-
Lionel GUEZ authored
targetted a single main program. In script plot_snapshot.py, with option --light, do not plot invalid outermost contours.
-