diff --git a/Inst_eddies/Documentation_texfol/Graphiques/.gitignore b/Inst_eddies/Documentation_texfol/Graphiques/.gitignore index bff17ec3edae4af3752272669b9cbe1062414d6a..cfb2f310c8fc84988e369272e950117bf33cc0a8 100644 --- a/Inst_eddies/Documentation_texfol/Graphiques/.gitignore +++ b/Inst_eddies/Documentation_texfol/Graphiques/.gitignore @@ -13,3 +13,4 @@ user_sys.pdf slice.pdf nearby_extr.pdf descending.pdf +input_output.pdf diff --git a/Inst_eddies/Documentation_texfol/Graphiques/GNUmakefile b/Inst_eddies/Documentation_texfol/Graphiques/GNUmakefile index 9c330b0296b449460a36f82a0500c0201fa83c20..885462fbc25853ffbd9ac09317ffc8e5c45503af 100644 --- a/Inst_eddies/Documentation_texfol/Graphiques/GNUmakefile +++ b/Inst_eddies/Documentation_texfol/Graphiques/GNUmakefile @@ -1,5 +1,6 @@ -objects = degeneracy.pdf periodicity.pdf copy.pdf set_contours.pdf \ -SHPC.pdf plot_test_output.pdf slice.pdf nearby_extr.pdf descending.pdf +objects = degeneracy.pdf periodicity.pdf copy.pdf set_contours.pdf \ +SHPC.pdf plot_test_output.pdf slice.pdf nearby_extr.pdf \ +descending.pdf input_output.pdf %.pdf: %.odg unoconv --doctype=graphics $< diff --git a/Inst_eddies/Documentation_texfol/Graphiques/input_output.odg b/Inst_eddies/Documentation_texfol/Graphiques/input_output.odg new file mode 100644 index 0000000000000000000000000000000000000000..b8cf0a6580ed09619e4feb7e60a5b921c8144f47 Binary files /dev/null and b/Inst_eddies/Documentation_texfol/Graphiques/input_output.odg differ diff --git a/Inst_eddies/Documentation_texfol/documentation.tex b/Inst_eddies/Documentation_texfol/documentation.tex index 4644f5f8f4fe5de5ac88823ad7d91b9d7e735f01..dfdf69306a3578dbedb6ade8c9a24a8376e1dfae 100644 --- a/Inst_eddies/Documentation_texfol/documentation.tex +++ b/Inst_eddies/Documentation_texfol/documentation.tex @@ -650,7 +650,17 @@ conserve deux de ces maximaux et il n'y a pas de bon contour possible, alors qu'on pourrait en principe en trouver. On se désintéresse de ces cas pathologiques. -\section{Sorties} +\section{Entrées et sorties} + +Cf. figure \ref{fig:input_output}. +\begin{figure} + \centering + \includegraphics{input_output} + \caption{Entrées et sorties} + \label{fig:input_output} +\end{figure} +\verb+grid_nml.txt+ sert de communication entre les programmes +\verb+inst_eddies+ et \verb+eddy_graph+. Format shapefile. Un type de géométrie par fichier donc il faut séparer les contours et les positions des extremums. diff --git a/Inst_eddies/config.f90 b/Inst_eddies/config.f90 index dad4835d65f38a47d92a0b1eac192cf1ac51d4a4..8381cd9ee0b1690e740b5fbc697de75334d5db8f 100644 --- a/Inst_eddies/config.f90 +++ b/Inst_eddies/config.f90 @@ -37,7 +37,7 @@ contains !---------------------------------------------------------------------- - print *, "Enter config_nml:" + print *, "config: Enter config_nml:" read(unit = *, nml = config_nml) call new_unit(unit) open(unit, file = "used_config_nml.txt", status = "replace", & diff --git a/Inst_eddies/input_ssh.f90 b/Inst_eddies/input_ssh.f90 index a98d8950791af3f971b1b896d8a1efaf497dfeed..043b630d02602b89123addf44b19119f7b42910d 100644 --- a/Inst_eddies/input_ssh.f90 +++ b/Inst_eddies/input_ssh.f90 @@ -25,7 +25,11 @@ contains use config_m, only: max_radius real, intent(out):: step(:) ! (2) longitude and latitude steps, in rad + logical, intent(out):: periodic ! grid is periodic in longitude + ! If periodic, we assume that in the NetCDF file, the last + ! longitude does not repeat the first longitude modulo 360 + ! degrees. real, allocatable, intent(out):: ssh(:, :) ! (1 - max_radius(1):nlon + max_radius(1), nlat) if periodic, else @@ -74,9 +78,6 @@ contains step = step_deg * deg_to_rad print *, "input_ssh: periodic = ?" read *, periodic - ! (If periodic, we assume that in the NetCDF file, the last - ! longitude does not repeat the first longitude modulo 360 - ! degrees.) if (periodic) call assert(4 * max_radius(1) < nlon, "input_ssh: max_radius") copy = merge(max_radius(1), 0, periodic) allocate(ssh(1 - copy:nlon + copy, nlat), u(1 - copy:nlon + copy, nlat), &