Skip to content
Snippets Groups Projects
  1. 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
  2. Feb 18, 2020
    • 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
  3. 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
  4. May 17, 2019
    • Lionel GUEZ's avatar
      In script `plot_snapshot.py`, add `ax` argument to function · 52884ddf
      Lionel GUEZ authored
      `snapshot`. Also, move calls to `ax.gridlines` and `ax.coastlines`
      inside function `snapshot`. These changes allow us to call `snapshot`
      in a new figure.
      
      Move `Region4/2006_01_01` to `Region4_2006_01_01` and
      `Region4/2006_01_02` to `Region4_2006_01_02`.
      
      Add a test of `successive_overlap` for a larger region, for which the
      identifying numbers of the connected eddies are not the same for all
      edges. Add corresponding input files.
      
      Bug fix in main program `test_successive_overlap`.
      52884ddf
    • Lionel GUEZ's avatar
      Reorganize the script `plot_snapshot.py` so that we can plot several · 5e0e0deb
      Lionel GUEZ authored
      snapshots in the same figure: useful for visualizing overlaps. So move
      lines plotting a snapshot inside a new function called
      snapshot and add option `--dashed`.
      
      Remove the option `-e` of `plot_snaphot.py` and add directory argument
      instead. The idea is that we now consider the three shapefiles as a
      whole, they should always be alone in a dedicated directory.
      
      Move the three shapefiles of `Tests/Input/Region_4/2006_01_02` to a
      dedicated directory.
      
      In `plot_snapshot.py`, netCDF variables for wind are now expected to be
      called ugos and vgos.
      
      Add a test for overlap of two different snapshots.
      5e0e0deb
  5. May 13, 2019
    • Lionel GUEZ's avatar
      We want to always group the three shapefiles, that is actually nine · 6784855a
      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.
      6784855a
  6. Apr 30, 2019
  7. Apr 04, 2019
  8. Feb 28, 2019
  9. Oct 08, 2018
    • Lionel GUEZ's avatar
      Promote internal procedure get_var of procedure get_snapshot to module · bb70e28e
      Lionel GUEZ authored
      procedure so it can be used by program test_set_all_outerm.
      
      Move dummy argument corner of set_all_outerm to last position.
      
      Bug fix in procedure get_snapshot: urc(2) must always be lower than
      nlat, even if periodic is true. Fix the same bug in procedure
      set_all_outerm: llc(2) >= 1 and urc(2) <= nlat even if periodic is true.
      
      Bug fix in procedure set_all_outerm: the lower bound of dummy argument
      ssh is not always 1.
      
      Make script examine_ssh_values.py work for a periodic domain.
      
      Make program test_set_all_outerm work for a periodic
      domain. max_radius is now chosen at run-time (we must change it for
      a very coarse grid). Add a corresponding test.
      
      In written shapefiles, replace field "area" by field "r_eq_area",
      that is radius of disk of equal area. This is a smaller number so it
      needs fewer characters, especially for a global coarse grid.
      bb70e28e
  10. Sep 04, 2018
Loading