r.damflood: Update manual and migrate Italian to English by echoix · Pull Request #683 · OSGeo/grass-addons

echoix · 2022-01-22T17:14:06Z

The changes in this addon were made in a separate PR since they were more important than others.

Before merging, I'd like some attentive feedback from Italian-speaking contributors to validate that the comments have the same meaning. I tried my best to find something that works in the code context.

…addons into r.damflood-patch-1

src/raster/r.damflood/r.damflood.html

echoix · 2022-01-22T17:19:02Z

src/raster/r.damflood/SWE.c

-        /* controlla Q=0.0 & volume=0.0                    */
+    /* TO BE PLACED IN ADDITIONAL FUNCTION IN fall.c   */
+    /* called both here and in main                    */
+	/* Check (for) Q=0.0 & volume=0.0                  */


Is it check, check for, checking, etc that is meant for the last line?

Also, there is no fall.c here

echoix · 2022-01-22T17:20:48Z

src/raster/r.damflood/SWE.c

-
+    // DESCRIPTION OF METHOD
+    // First cycle: Calculation of new water heights at time t + 1:
+    //      - Downstream of the dam: Apply continuity equation to shallow water (?)


Unsure of this sentence, need to remove (?) when someone understands the original meaning

src/raster/r.damflood/SWE.c

echoix · 2022-01-22T17:23:16Z

src/raster/r.damflood/SWE.c

+    //      - Upstream of the dam:
+    //          - In methods 1 and 2:
+    //              - The continuity equation is applied to the volume of the lake
+    //                Physically this leads to a less realistic but avoids 


This didn't make much sense, but it was the closest that kept the same meanings of the Italian comment. Someone has a better explication?

I think swe applies where speed in plane directions are of a magnitude higher than in vertical direction, and in a lake it is questionable...

src/raster/r.damflood/SWE.c

src/raster/r.damflood/main.c

src/raster/r.damflood/r.damflood.html

echoix · 2022-01-22T17:52:54Z

src/raster/r.damflood/r.damflood.html

+In case of numerical stability problems, the user is warned, and the
+simulation is stopped.<br>


I had a hard time deciding if this was the correct interpretation, given that code is speaking of "Courant-Friedrich-Lewy stability condition" and seems specific to the numerical algorithm. I tried to learn more on this, but I'm still not quite sure. This sentence refers to (now) lines 889-895 of main.c, comments at (now) lines 84-94 of SWE.c, code and comments of lines 550-536 and 724-742 of SWE.c.

Could @rmarzocchi84 or @massimiliano-cannata please help here?

echoix · 2022-01-22T17:54:51Z

src/raster/r.damflood/r.damflood.html

+Optionally the user may modify the initial timestep used for the numerical
+solution of the SWE (<em>default value = 0.01 s</em>), nevertheless the
+timestep [<b>timestep</b>],
+and choose a specific failure type corresponding to the different computational
+methods for the initial velocity estimation.


I'm not sure of what was meant about the original "nevertheless"

src/raster/r.damflood/r.damflood.html

Co-authored-by: Nicklas Larsson <n_larsson@yahoo.com>

veroandreo · 2022-01-24T14:27:41Z

@rmarzocchi84 would you mind assisting with @echoix translation questions above?? Much appreciated! :)

rmarzocchi84 · 2022-01-24T14:40:11Z

@rmarzocchi84 would you mind assisting with @echoix translation questions above?? Much appreciated! :)

I will finish the review tomorrow! Many thanks for your work @echoix really appreciated !!

echoix · 2022-01-26T13:51:13Z

My second step was to refactor the variable names to have them based on English, to finish the dependency on Italian for future contributors. Should it be done here while you are still available?

In both cases, take your time and I'll apply the suggestions this weekend.

neteler · 2022-04-24T14:36:41Z

@echoix Do you see a chance to complete this PR? Thanks!

echoix · 2022-04-24T15:13:42Z

Thanks for the heads up!
In fact the suggestions added were all applied, I was waiting for a return for the rest of the review from @rmarzocchi84, but it didn't came through yet.

I still have the question of "do we try to refactor Italian variable names" in the scope of this PR to help keep the addon maintainable while the origin author is still accessible?

The draft status was to not make it ready to merge, since we were waiting for a response.

echoix · 2023-12-30T19:07:28Z

@lucadelu I was wondering if you would mind helping out with the italian here. Its one of my first PRs two years ago, and never got to finish it up yet.

veroandreo

Minor fixes in translation. I still have problems understanding L385 and the word stramazzo. I did not check the html file as I am not familiar with the topic.

src/raster/r.damflood/SWE.c

src/raster/r.damflood/main.c

echoix · 2023-12-31T00:31:52Z

Minor fixes in translation. I still have problems understanding L385 and the word stramazzo. I did not check the html file as I am not familiar with the topic.

Is stramazzo from https://it.m.wikipedia.org/wiki/Stramazzo the same as spillway from https://en.m.wikipedia.org/wiki/Spillway?

Html had way less changes, it was already in English.

src/raster/r.damflood/main.c

echoix · 2023-12-31T00:42:32Z

Sorry, it's quite hard to review now, since the changes started before the code was formatted, and it was really hard to solve the conflicts (I merged in several passes since trying to merge from the current grass8 branch was too off)

Co-authored-by: Veronica Andreo <veroandreo@gmail.com>

echoix · 2023-12-31T01:02:15Z

src/raster/r.damflood/SWE.h

@@ -1,27 +1,26 @@
 float velocita_breccia(int i, double h);


Is velocita_breccia the velocity of breach, break, or another concept?

deepl also suggest gap, hole

Maybe "Breakthrough speed"?

echoix

Clang format

src/raster/r.damflood/main.c

lucadelu · 2023-12-31T08:17:23Z

@lucadelu I was wondering if you would mind helping out with the italian here. Its one of my first PRs two years ago, and never got to finish it up yet.

@echoix I checked the file and looks good to me, I have no idea about translation of stramazzo because I don't really know what is it in Italian too. Maybe @rmarzocchi84 or @massimiliano-cannata can help here

massimiliano-cannata · 2023-12-31T08:26:11Z

Hi there, Stramazzo in English is spillway, or weir Maxi Il dom 31 dic 2023, 09:17 Luca Delucchi ***@***.***> ha scritto:

…

@lucadelu <https://github.com/lucadelu> I was wondering if you would mind helping out with the italian here. Its one of my first PRs two years ago, and never got to finish it up yet. @echoix <https://github.com/echoix> I checked the file and looks good to me, I have no idea about translation of stramazzo because I don't really know what is it in Italian too. Maybe @rmarzocchi84 <https://github.com/rmarzocchi84> or @massimiliano-cannata <https://github.com/massimiliano-cannata> can help here — Reply to this email directly, view it on GitHub <#683 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ADC2FTAHTUZIBZJFEOKIHXTYMENR7AVCNFSM5MSGRRPKU5DIOJSWCZC7NNSXTN2JONZXKZKDN5WW2ZLOOQ5TCOBXGI4DGOBQGM3Q> . You are receiving this because you were mentioned.Message ID: ***@***.***>

veroandreo · 2023-12-31T15:01:40Z

src/raster/r.damflood/SWE.h

@@ -1,27 +1,26 @@
 float velocita_breccia(int i, double h);


deepl also suggest gap, hole

veroandreo · 2023-12-31T15:03:39Z

src/raster/r.damflood/SWE.c

-    // abbassamento lago (siccome c'e due volte fare poi una function)
+    // Lake depth reduction (as there is twice do then a function)


The comment between parenthesis makes no sense to me

echoix added 11 commits January 3, 2022 14:36

Add english comments

9ac2a06

Spelling fixes in r.damflood

7eade51

r.damflood manual page revision

d80bfd3

r.damflood: Translation to English attempt in SWE

c0e7574

Merge branch 'OSGeo:grass8' into r.damflood-patch-1

b74a1b9

Merge branch 'OSGeo:grass8' into r.damflood-patch-1

bde6fbf

r.damflood: Improve manual and broken link

7809e78

r.damflood: Translate comments to English

283cc20

Merge branch 'r.damflood-patch-1' of https://github.com/echoix/grass-…

af848a3

…addons into r.damflood-patch-1

r.damflood: Continue translating SWE

dfefcbb

r.damflood: SWE keep original tab indentation

3ad438b

nilason reviewed Jan 22, 2022

View reviewed changes

src/raster/r.damflood/r.damflood.html Outdated Show resolved Hide resolved

echoix commented Jan 22, 2022

View reviewed changes

r.damflood: End r.damflood.html with newline.

11fea4c

Co-authored-by: Nicklas Larsson <n_larsson@yahoo.com>

Update src/raster/r.damflood/SWE.c

f4e304d

echoix marked this pull request as draft January 26, 2022 13:51

r.damflood: Apply suggestions

575f2fc

echoix added 8 commits December 30, 2023 09:44

Merge branch 'grass8' into r.damflood-patch-1

796b43c

Merge branch 'grass8' into r.damflood-patch-1

e3ca1ef

Merge branch 'grass8' into r.damflood-patch-1

60d3351

Merge branch 'grass8' into r.damflood-patch-1

5bd8815

Merge branch 'grass8' into r.damflood-patch-1

f0ebe9a

Merge branch 'grass8' into r.damflood-patch-1

b596a54

Add comments to function parameters in SWE.h

a5fd00f

Fix formatting in main.c

c79c37b

Fix formatting of comments in SWE.c

d13187d

echoix force-pushed the r.damflood-patch-1 branch from 5102c66 to d13187d Compare December 30, 2023 18:49

r.damflood: Fix typos and formatting of manual

76149f0

echoix marked this pull request as ready for review December 30, 2023 18:59

veroandreo reviewed Dec 31, 2023

View reviewed changes

echoix commented Dec 31, 2023

View reviewed changes

src/raster/r.damflood/main.c Show resolved Hide resolved

Apply suggestions from code review

db2c0d8

Co-authored-by: Veronica Andreo <veroandreo@gmail.com>

echoix commented Dec 31, 2023

View reviewed changes

src/raster/r.damflood/main.c Outdated Show resolved Hide resolved

Update main.c

24c42d6

veroandreo reviewed Dec 31, 2023

View reviewed changes

echoix added 5 commits August 3, 2025 22:35

Merge branch 'grass8' into r.damflood-patch-1

97e5b66

r.damflood: Sync html changes to md

9901ec8

Merge branch 'grass8' into r.damflood-patch-1

7574983

Merge branch 'grass8' into r.damflood-patch-1

f7f9b3b

Merge branch 'grass8' into r.damflood-patch-1

57905ad

		In case of numerical stability problems, the user is warned, and the
		simulation is stopped.<br>

		// abbassamento lago (siccome c'e due volte fare poi una function)
		// Lake depth reduction (as there is twice do then a function)

Comments

Conversation

echoix commented Jan 22, 2022

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

veroandreo commented Jan 24, 2022

Uh oh!

rmarzocchi84 commented Jan 24, 2022

Uh oh!

echoix commented Jan 26, 2022

Uh oh!

neteler commented Apr 24, 2022

Uh oh!

echoix commented Apr 24, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

echoix commented Dec 30, 2023

Uh oh!

veroandreo left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

echoix commented Dec 31, 2023

Uh oh!

Uh oh!

echoix commented Dec 31, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

echoix left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lucadelu commented Dec 31, 2023

Uh oh!

massimiliano-cannata commented Dec 31, 2023 via email

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

echoix commented Apr 24, 2022 •

edited

Loading