Skip to content
Snippets Groups Projects
  1. Jul 27, 2022
    • Lionel GUEZ's avatar
      Assume "{shpc_dir}/{orientation}/Slice_{slice}" · 789b6dbc
      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`.
      789b6dbc
    • Lionel GUEZ's avatar
      Rename `write_snapshot` to `save_snapshot` · bf424501
      Lionel GUEZ authored
      Rename procedure `write_snapshot` to `save_snapshot`.
      bf424501
  2. Jul 26, 2022
    • Lionel GUEZ's avatar
      Split `shpc_slice_handler` · 9219ce9a
      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.
      9219ce9a
    • Lionel GUEZ's avatar
      Create component `unit` in `shpc_slice_handler` · 13ff23e3
      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`.
      13ff23e3
    • Lionel GUEZ's avatar
      Rename type shpc to `shpc_slice_handler` · 51b4120d
      Lionel GUEZ authored
      51b4120d
  3. Jul 25, 2022
  4. Jan 04, 2022
  5. Jul 19, 2021
  6. Jul 01, 2021
    • Lionel GUEZ's avatar
      Do not create `number_eddies.csv` in `eddy_graph` · 53a93fa8
      Lionel GUEZ authored
      Do not create file `number_eddies.csv` in program `eddy_graph`. Since
      there are no interpolated eddies any longer, the file
      `number_eddies.csv` just contained the same information that is in
      `ishape_last.txt` in the input SHPC. Remove argument
      `unit_number_eddies` of procedure `dispatch_snapshot`.
      53a93fa8
  7. Jun 29, 2021
  8. Jun 22, 2021
  9. Feb 26, 2021
    • Lionel GUEZ's avatar
      Split arborescence into `Inst_eddies` and Overlap · 56150231
      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.
      56150231
  10. Apr 27, 2020
  11. Apr 16, 2020
  12. Apr 15, 2020
    • GUEZ Lionel's avatar
      Use `shp_triplet` components for field identifiers · 59b5a302
      GUEZ Lionel authored
      Use the components for field identifiers of a variable of type
      `shp_triplet` instead of storing these field identifiers in variables
      of modules `init_shapefiles_m` and `read_field_indices_m`. The dummy
      argument hshp of procedure `read_field_indices` becomes
      `intent(inout)`.
      59b5a302
    • GUEZ Lionel's avatar
      Create derived type `shp_triplet` · df32aa8f
      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`.
      df32aa8f
    • GUEZ Lionel's avatar
      Polish · 35561387
      GUEZ Lionel authored
  13. Apr 08, 2020
    • GUEZ Lionel's avatar
      `test_get_snapshot` to `test_get_dispatch_snap` · fda1e6cd
      GUEZ Lionel authored
      In procedure `dispatch_snapshot`, rename dummy argument m to rank,
      clearer.
      
      Rename program `test_get_snapshot` to `test_get_dispatch_snap` and
      make it call `dispatch_snapshot` instead of `send_snapshot`. The only
      difference in result is that the program now writes files
      `isolated_nodes.txt` and `number_eddies.csv`.
      
      Check in program `test_overlap` that it is run on a single MPI process.
      fda1e6cd
  14. Apr 07, 2020
    • GUEZ Lionel's avatar
      Run MPI programs with mpiexec · d89d6b90
      GUEZ Lionel authored
      Change order of dummy arguments of procedure `get_snapshot` to make it
      more convenient to call with keywords. Rename dummy argument m to
      rank, clearer.
      
      Bug fix in `short_tests_.json`: run `test_read_snapshot` and
      `test_overlap` with `mpiexec -n 1`, else the programs may not be able
      to read standard input.
      d89d6b90
  15. Mar 06, 2020
    • Lionel GUEZ's avatar
      Add a receive test for program `test_get_snapshot` · d07eaadf
      Lionel GUEZ authored
      On our way to a generalization of script `filter.py`: use a function
      to define the filter.
      
      In script `plot_snapshot.py`, accept a triplet of shapefiles without
      `ishape_last.txt`.
      
      Add a test for program `test_get_snapshot` where one of the processes
      does a reception in procedure `get_snapshot`.
      
      Bug fix in main unit `test_get_snapshot`: we send and receive date k.
      d07eaadf
  16. Mar 05, 2020
    • Lionel GUEZ's avatar
      Generalize main unit `test_get_snapshot` · e1aa5bcc
      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.
      e1aa5bcc
  17. Feb 18, 2020
    • Lionel GUEZ's avatar
      First compilation and test of `get_snapshot` · 29ee10af
      Lionel GUEZ authored
      First compilation and test of procedure `get_snapshot`. Change order
      of dummy arguments of procedure `get_snapshot`: make it more
      convenient for call with keywords. Replace dummy arguments periodic
      and `dist_lim` by dummy argument copy. Add dummy arguments
      `ishape_last` and k1. Promote `hshp_extremum`, `hshp_outermost`,
      `hshp_max_speed` from local variables to dummy arguments.
      
      In program `test_read_snapshot`, read input SHP triplet from command
      line instead of requiring it to be present in the current directory
      with the name `SHP_triplet_old`.
      
      Remove directory `Tests/Input/Region_1/SHP_triplet`, which was not used.
      29ee10af
    • Lionel GUEZ's avatar
      Make date index `intent(in)` in `read_snapshot` · 7e9c066b
      Lionel GUEZ authored
      Change of idea: make date index an intent in argument of procedure
      `read_snapshot`. Replace dummy arguments `ishape_first` and scalar
      `ishape_last` by k1 and array `ishape_last`. It is now the task of
      `read_snapshot` to find the ishapes to read. This seems clearer.
      7e9c066b
  18. Feb 07, 2020
    • Lionel GUEZ's avatar
      Use SHP triplets with several snapshots · d023fd3f
      Lionel GUEZ authored
      Organize better the directory `Input`: create sub-directories for regions.
      
      Big change: use SHP triplets that can contain several snapshots. So
      program `test_overlap` reads a single SHP triplet. The dates that
      `test_overlap` should read are now specified in the input
      namelist. SHP triplet directory must now contain a file named
      `contents.csv`. `test_overlap` reads `contents.csv` into variables k1
      and `ishape_last`. So there is no longer any need to read the number
      of entities in one of the shapefiles.
      
      For each region, concatenate SHP triplets for dates 2006/01/01 and
      2006/01/02.
      
      Read namelist from process 0 in program `test_send_recv`: it is
      simpler since it is the default setting of mpiexec and I do not see
      any drawback.
      
      In programs `test_read_snapshot` and `test_send_recv`, just hard code
      for now the ishapes we want to read in the SHP triplet.
      d023fd3f
  19. Jan 28, 2020
    • Lionel GUEZ's avatar
      Generalize `read_snapshot` · d18ad095
      Lionel GUEZ authored
      Generalize `read_snapshot`. Add dummy argments `ishape_first` and
      `ishape_last`. This allows getting a snaphot from a triplet of
      shapefiles containing several snapshots. Consequence: move the call to
      `shp_get_info_03` from `read_snapshot` to `test_overlap`,
      `test_read_snapshot` and `test_send_recv`.
      
      Remove opening and closing of shapefiles from procedure
      `get_snapshot`. Since a triplet of shapefiles can contain several
      snapshots, we do not want to open and close the same shapefiles
      several times from the same MPI process.
  20. Jan 10, 2020
    • Lionel GUEZ's avatar
      Complete `send_snapshot` and `recv_snapshot` · 9fb56f5f
      Lionel GUEZ authored
      Pass argument copy to `read_snapshot` rather than arguments periodic
      and `dist_lim`. Motivation: do not recompute copy at each call of
      `read_snapshot`. `read_snapshot` is going to be called many times in
      overlap program, with always the same value of copy. And we do not
      need the values of periodic and `dist_lim` separately in
      `read_snapshot`.
      
      Complete `send_snapshot` and `recv_snapshot` by sending and receiving
      an entire snapshot. So we need nlon, nlat and copy in `recv_snapshot`
      to allocate `extr_map`. It is better to pass arguments nlon, nlat and
      copy than sending and receiving the shape of `extr_map` with MPI, of
      course, since the shape is the same for all snapshots. In program
      `test_send_recv`, write the entire received snaphot.
      
      Bug fix in `Tests/CMakeLists.txt`: several targets missed
      `${netcdff_INCLUDE_DIR}`.
      
      Create procedure `write_snapshot` from code in main program
      `test_read_snapshot`, because we need to do this also in program
      `test_send_recv`. Note the dissymmetry with `read_snapshot`, which
      does not include the opening and closing of the shapefiles. That is
      because we anticipate calling `read_snapshot` several times with the
      same shapefiles in program overlap.
      
      Change order of dummy arguments of procedure `write_extr_map`. More
      convenient for calling it with keywords from `write_snapshot`.
      9fb56f5f
  21. Dec 26, 2019
    • Lionel GUEZ's avatar
      Send and receive a whole eddy in `test_send_recv` · 0b01c42f
      Lionel GUEZ authored
      We need the dummy version of EZMPI for sequential programs linking
      with `Shapelib_03`.
      
      Replace `include_directories` by `target_include_directories` in
      `Tests/CMakeLists.txt`. Motivation: some targets do no use ezmpi. This
      implies adding directories to `target_include_directories` for
      `extraction_eddies`.
      
      In `send_snapshot` and `recv_snapshot`, send and receive a whole
      eddy. Read and write a snapshot in `test_send_recv`.
      0b01c42f
  22. Sep 24, 2019
    • Lionel GUEZ's avatar
      Use `SHP_triplet` instead of Snapshot · 69200aca
      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.
      69200aca
Loading