[GRASS-SVN] r63946 - in grass/branches/releasebranch_7_0: . lib/gis raster/r.sim/r.sim.sediment

svn_grass at osgeo.org svn_grass at osgeo.org
Sat Jan 3 12:27:28 PST 2015 

Author: annakrat
Date: 2015-01-03 12:27:28 -0800 (Sat, 03 Jan 2015)
New Revision: 63946

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/gis/renamed_options
   grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c
   grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/r.sim.sediment.html
Log:
r.sim.sediment: rename parameters (merge from trunk, r63945)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63940-63941
   + /grass/trunk:60817,61096,61141,61994,62105,62179-62180,62182,62190,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750-62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62828,62831,62838,62845,62847,62850,62856,62879,62881,62886,62904,62907-62908,62910,62912,62914,62916,62918,62920,62925,62932-62933,62935,62940,62942,62944-62946,62949,62955-62956,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040,63043-63044,63047,63049,63051,63053,63055,63057,63060,63062-63064,63066,63068,63070-63071,63074,
 63076,63079,63081,63083,63085,63087,63089,63091,63093,63095,63098,63100,63102,63105,63107,63109,63111,63113-63114,63116,63119,63121,63123,63125,63130,63132-63133,63135,63137,63140,63143,63145,63147,63149,63151,63153-63154,63157,63160,63165,63170,63173,63175,63187,63192-63193,63196,63199-63200,63202,63209,63216,63220-63221,63224,63227,63240,63246,63250,63255,63259,63261,63275-63276,63279,63281,63283,63287,63290,63292,63297,63302,63304-63307,63315,63319,63327,63330,63332,63339,63342,63345,63361-63363,63367,63379,63389,63391,63393,63402,63408-63409,63416-63417,63425,63427,63429,63431,63433,63448,63451,63453,63457,63459,63464-63470,63473,63482,63497,63505,63508,63510,63515,63521-63524,63526,63536-63537,63551-63552,63554,63556,63558-63559,63562,63570,63576,63582,63589-63593,63602,63604,63608-63609,63616,63618,63624,63626,63628,63630,63634,63639,63642,63644,63650,63652,63656,63679,63685,63689,63691,63693,63695,63698,63700-63702,63704,63706-63707,63709,63711,63713,63715,63717-63718
 ,63721-63727,63731,63733,63736,63740-63742,63744-63749,63751-63752,63756,63758,63760-63761,63767,63777,63780,63783,63787,63793,63796-63798,63801,63803,63807-63808,63812,63814,63816,63821,63823-63824,63827-63828,63830-63831,63834-63835,63837-63839,63841,63843-63844,63846-63847,63849,63851,63853,63855-63856,63858-63859,63862,63865,63869,63871,63882,63884,63889-63890,63892-63895,63897-63898,63900,63902-63903,63905,63907,63909-63911,63913-63914,63927,63940-63941,63945

Modified: grass/branches/releasebranch_7_0/lib/gis/renamed_options
===================================================================
--- grass/branches/releasebranch_7_0/lib/gis/renamed_options	2015-01-03 20:26:09 UTC (rev 63945)
+++ grass/branches/releasebranch_7_0/lib/gis/renamed_options	2015-01-03 20:27:28 UTC (rev 63946)
@@ -260,11 +260,12 @@
 r.sim.sediment|tranin:transport_coeff
 r.sim.sediment|tauin:shear_stress
 r.sim.sediment|manin:man
+r.sim.sediment|flux:sediment_flux
 r.sim.sediment|maninval:man_value
 r.sim.sediment|outwalk:walkers_output
-r.sim.sediment|tc:sedflow_capacity
+r.sim.sediment|tc:transport_capacity
 r.sim.sediment|et:tlimit_erosion_deposition
-r.sim.sediment|conc:concentration
+r.sim.sediment|conc:sediment_concentration
 r.sim.sediment|erdep:erosion_deposition
 r.sim.sediment|nwalk:nwalkers
 r.sim.sediment|niter:niterations

Modified: grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c	2015-01-03 20:26:09 UTC (rev 63945)
+++ grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/main.c	2015-01-03 20:27:28 UTC (rev 63946)
@@ -168,7 +168,7 @@
     parm.observation->guisection = _("Input");
 
     parm.tc = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.tc->key = "sedflow_capacity";
+    parm.tc->key = "transport_capacity";
     parm.tc->required = NO;
     parm.tc->description = _("Name for output transport capacity raster map [kg/ms]");
     parm.tc->guisection = _("Output");
@@ -181,14 +181,14 @@
     parm.et->guisection = _("Output");
 
     parm.conc = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.conc->key = "concentration";
+    parm.conc->key = "sediment_concentration";
     parm.conc->required = NO;
     parm.conc->description =
 	_("Name for output sediment concentration raster map [particle/m3]");
     parm.conc->guisection = _("Output");
 
     parm.flux = G_define_standard_option(G_OPT_R_OUTPUT);
-    parm.flux->key = "flux";
+    parm.flux->key = "sediment_flux";
     parm.flux->required = NO;
     parm.flux->description = _("Name for output sediment flux raster map [kg/ms]");
     parm.flux->guisection = _("Output");

Modified: grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/r.sim.sediment.html
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/r.sim.sediment.html	2015-01-03 20:26:09 UTC (rev 63945)
+++ grass/branches/releasebranch_7_0/raster/r.sim/r.sim.sediment/r.sim.sediment.html	2015-01-03 20:27:28 UTC (rev 63946)
@@ -24,11 +24,11 @@
 reference literature (see suggested values in Notes and References). <br>
 
 <p>
-Output includes transport capacity raster map <i>sedflow_capacity</i>  in [kg/ms],
+Output includes transport capacity raster map <i>transport_capacity</i>  in [kg/ms],
 transport capacity limited erosion/deposition raster map
 <i>tlimit_erosion_deposition</i> [kg/m<sup>2</sup>s]i that are output almost immediately and
 can be viewed while the simulation continues. Sediment flow rate raster map 
-<i>flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
+<i>sediment_flux</i> [kg/ms], and net erosion/deposition raster map [kg/m<sup>2</sup>s]
 can take longer time depending on time step and simulation time. 
 Simulation time is controled by <i>niterations</i> [minutes] parameter. 
 <!-- Output files can be saved during simulation using <i>outiter</i> parameter

More information about the grass-commit mailing list