Skip to content
Snippets Groups Projects
  1. Jul 01, 2021
    • Lionel GUEZ's avatar
      Write file `node_id_param.json` · 502d4b90
      Lionel GUEZ authored
      Write file `node_id_param.json` from programs `test_overlap` and `eddy_graph`.
      502d4b90
    • Lionel GUEZ's avatar
      Write node indices · c3052a2c
      Lionel GUEZ authored
      Write node indices instead of dates and eddy indices in
      edgelist. Compute `e_overestim` from `ishape_last`. Remove header
      lines of edgelist. See commit 3370733a. Replace argument d of procedure
      overlap by arguments `e_overestim` and k.
      c3052a2c
    • Lionel GUEZ's avatar
      Polish · 757bad90
      Lionel GUEZ authored
      757bad90
    • Lionel GUEZ's avatar
      Remove component `number_eddies` of snapshot · a24e8dfd
      Lionel GUEZ authored
      Remove component `number_eddies` of derived type snapshot. It was the
      same as `number_vis_extr` since there are no interpolated eddies any longer.
      a24e8dfd
    • Lionel GUEZ's avatar
      Do not write interpolated eddies · 50d2f596
      Lionel GUEZ authored
      This is a big change, a big simplification. Creating interpolated
      eddies was the way of Alexis Chaigneau. Rémi L. thinks it is no longer
      useful.
      
      So remove procedure `init_interpolated_eddy`; do not create SHPC for
      interpolated eddies in programs `eddy_graph`, `test_overlap` and
      `test_write_overlap`; remove argument `hshp_interp` of procedure
      overlap; remove arguments `hshp_interp`, m, cyclone, `coord_extr_1`,
      `ssh_extr_1`, `coord_extr_2` and `ssh_extr_2` of procedure
      `write_overlap`.
      50d2f596
    • Lionel GUEZ's avatar
      Redefine `k_test_[12]` as date indices · 664f62bb
      Lionel GUEZ authored
      Redefine `k_test_[12]` as date indices (0-based) instead of dates.
      664f62bb
  2. Jun 29, 2021
  3. Jun 22, 2021
  4. Jun 17, 2021
  5. Jun 15, 2021
  6. Mar 30, 2021
  7. Mar 24, 2021
  8. Mar 02, 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. Feb 05, 2021
    • Lionel GUEZ's avatar
      Group `new_unit` and open · 268d9915
      Lionel GUEZ authored
      Group `new_unit` and open in the same procedure, that we rename from
      `set_unit_edge` to `open_edge_file`. This removes the need for a
      special version of `new_unit` and it is closer to the use of the
      `new_unit` keyword in Fortran 2008.
      268d9915
    • Lionel GUEZ's avatar
      Polish · e1743a2e
      Lionel GUEZ authored
      e1743a2e
  11. Feb 03, 2021
    • Lionel GUEZ's avatar
      Split edge-list in 2 for cyclones and anticyclones · df2b397d
      Lionel GUEZ authored
      This makes the program `eddy_graph` heavier but it makes sense because
      there can be no connection between the two graphs, and we need to make
      the graphs as small as possible for large spatio-temporal domains.
      df2b397d
    • Lionel GUEZ's avatar
      Create module `unit_edge_m` for `unit_edgelist` · 5413e683
      Lionel GUEZ authored
      `unit_edgelist` was just transmitted by procedure overlap from main
      program unit to `write_overlap`. So now overlap does not see
      `unit_edgelist`. Further motivation: we are going to split the edge
      list file into two files.
      5413e683
  12. Jul 21, 2020
  13. Jun 15, 2020
    • Lionel GUEZ's avatar
      Create `loop_shp_tr_append.py` · c58c21b7
      Lionel GUEZ authored
      Replace `loop_shp_append.py` by `loop_shp_tr_append.py`. Instead of
      looping on years, we assume we are working on a single year. We could
      call this script inside a loop on years in the shell. The advantage is
      that we need to make fewer assumptions on the arborescence of
      files. Also, we can make `loop_shp_tr_append.py` more general by
      starting and ending at arbitrary days. We drop the timing that was in
      `loop_shp_append.py`. We add the creation of file `ishape_last.txt`.
      
      In script `shp_tr_append.sh`, assume that the directories contain
      files `ishape_last.txt` and modify `ishape_last.txt` in the
      destination directory.
      
      In program `test_overlap`, read grid description from a file
      `grid_nml.txt` in SHP triplet directory, instead of from standard
      input. This is the same modification we made for program
      `eddy_graph`. Modify input files accordingly.
      c58c21b7
  14. Apr 27, 2020
  15. Apr 16, 2020
  16. 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
  17. 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
  18. 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
  19. Feb 18, 2020
    • 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
    • Lionel GUEZ's avatar
      Replace `contents.csv` by `ishape_last.txt` · 67346265
      Lionel GUEZ authored
      Change of idea: instead of storing `date_index` and `ishape_last` in a
      file `contents.csv`, store only `ishape_last` in a file
      `ishape_last.txt`. The `date_index` column was useless and it
      complicated reading the file. The first value of `date_index` can be
      read from one of the three DBF files. Also, to roll with the flow, let
      the lower bound of `ishape_last` in main unit `test_overlap` be 1
      instead of k1.
      
      Change order of actual arguments of `dbf_read_attribute_03` following
      revision of `Shapelib_03`.
      67346265
  20. 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
  21. 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.
Loading