[GRASS-SVN] r64797 - in grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform: . code

[svn_grass at osgeo.org]

Author: ychemin
Date: 2015-03-03 17:29:11 -0800 (Tue, 03 Mar 2015)
New Revision: 64797

Modified:
   grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/Makefile
   grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/code/code1.tex
   grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.bib
   grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.tex
Log:
update

Modified: grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/Makefile
===================================================================
--- grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/Makefile	2015-03-04 01:02:31 UTC (rev 64796)
+++ grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/Makefile	2015-03-04 01:29:11 UTC (rev 64797)
@@ -32,7 +32,7 @@
 	pdflatex -shell-escape -output-directory=$(CODEDIR) $< 
 
 clean:
-	rm -f *~ *.aux *.log *.out *.toc *.bbl *.blg *-blx.bib *.ps
+	rm -f *~ *.aux *.log *.out *.toc *.bbl *.blg *-blx.bib *.ps *.pyg
 	rm -f $(SVGPDF) $(CODEPDF)
 
 distclean:

Modified: grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/code/code1.tex
===================================================================
--- grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/code/code1.tex	2015-03-04 01:02:31 UTC (rev 64796)
+++ grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/code/code1.tex	2015-03-04 01:29:11 UTC (rev 64797)
@@ -3,30 +3,14 @@
 \begin{document}
 \begin{minted}[frame=single,linenos,mathescape,fontsize=\small]{py}
 
-#!/bin/env python
 from math import *
 
-def feolucey2000(uvvis2, uvvis4):
- return(17.427*(-atan(((uvvis4/uvvis2)-1.19)/(uvvis2-0.08)))-7.565)
-
-def feolawrence2002(uvvis2, uvvis4):
- return(5.7*((-0.147+0.372*(-(uvvis4/uvvis2-1.22)/(uvvis2-0.04))+\
- 	(-0.036)*pow((-(uvvis4/uvvis2-1.22)/(uvvis2-0.04)),2)))+2.15)
-
-def feowilcox2005(uvvis2, uvvis4):
-  return(-137.97*((uvvis2*0.9834)+(uvvis4/uvvis2*0.1813))+57.46)
-
-def feozhang2013(uvvis2,uvvis4):
-  return(17.83*(-atan(((uvvis4/uvvis2)-1.26)/0.01)) - 6.87)
-
 print "@Surveyor"
-#M3 at Surveyor crater
 
 uvvis2=0.05028829
 uvvis4=0.0579434
 
 print "@Bench"
-#M3 at Bench (north outside)
 
 uvvis2=0.05045871
 uvvis4=0.05715561

Modified: grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.bib
===================================================================
--- grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.bib	2015-03-04 01:02:31 UTC (rev 64796)
+++ grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.bib	2015-03-04 01:29:11 UTC (rev 64797)
@@ -97,8 +97,8 @@
 @inproceedings{raghavan2014deploying,
     author = {Raghavan, V. and Choosumrong, S. and Yoshida, D. and Vinayaraj, P.},
     title = {{Deploying Dynamic Routing Service for Emergency Scenarios using pgRouting, GRASS and ZOO}},
-    booktitle= {In Proceedings of FOSS4G Europe, Jacobs University, Bremen, Germany}
-    year = {2014}
+    booktitle= {In Proceedings of FOSS4G Europe, Jacobs University, Bremen, Germany},
+    year = {2014},
     month = {July}
 }
 
@@ -178,7 +178,7 @@
 address = {San Diego, California, USA},
 editor = {{Ames, D.P., Quinn, N.W.T., Rizzoli}, A.E. (Eds.)},
 url = {http://www.iemss.org/society/index.php/iemss-2014-proceedings},
-year = {2014}
+year = {2014},
 month = {jun},
 isbn = {978-88-9035-744-2}
 }
@@ -195,7 +195,7 @@
 author = {Mitas, Lubos and Mitasova, Helena},
 }
 
-@article {Mitas1998b,
+ at article{Mitas1998b,
 author = {Mitas, Lubos and Mitasova, Helena},
 title = {Distributed soil erosion simulation for effective erosion prevention},
 journal = {Water Resources Research},
@@ -232,3 +232,14 @@
 year = {2015},
 note = {Manuscript submitted for publication}
 }
+
+ at article{neteler2012grass,
+  title={{GRASS GIS: a multi-purpose Open Source GIS}},
+  author={Neteler, M. and Bowman, M.H. and Landa, M. and Metz, M.},
+  journal={Environmental Modelling \& Software},
+  year={2012},
+  volume = {31},
+  pages = {124–130},
+  publisher={Elsevier},
+  doi = "10.1016/j.envsoft.2011.11.014"
+}

Modified: grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.tex
===================================================================
--- grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.tex	2015-03-04 01:02:31 UTC (rev 64796)
+++ grass-promo/grassposter/2015_EGU_G7_PeerReview_SciPlatform/poster.tex	2015-03-04 01:29:11 UTC (rev 64797)
@@ -22,8 +22,8 @@
 % \setsecondcolor{gray!80!}
 % \setthirdcolor{red!80!black}
 
-\title{\bigskip GRASS GIS: a peer-reviewed scientific platform and future research repository\bigskip}
-\author{Yann Chemin$^4$, Vaclav Petráš$^3$, Anna Petrášova$^3$, Martin Landa$^2$,Soeren Gebbert$^5$, Pietro Zambelli$^6$, Markus Neteler$^1$, Peter Loewe$^7$, Magherita di Leo$^8$\\ \bigskip
+\title{\bigskip GRASS GIS: a peer-reviewed scientific platform\\ and future research repository\bigskip}
+\author{Yann Chemin$^4$, Vaclav Petráš$^3$, Anna Petrášova$^3$, Martin Landa$^2$, Soeren Gebbert$^5$, \\Pietro Zambelli$^6$, Markus Neteler$^1$, Peter Loewe$^7$, Magherita di Leo$^8$\\ \bigskip
 $^1$ CRI, FEM, Italy, $^2$ CTU in Prague, Czech Republic, $^3$ NCSU, USA, $^4$ IWMI, Sri Lanka, $^5$ TICSA, Germany, $^6$ EURAC, Italy, $^7$ GNLST, Germany, $^8$ EC-JRC, Itlay}
 
 \usetemplate{1}
@@ -88,7 +88,7 @@
 \end{minipage}
 
 \begin{minipage}{0.25\textwidth}
-\small {\url{www.bbk.ac.uk}}
+\small {\url{grasswiki.osgeo.org}}
 \end{minipage}
 
 \begin{minipage}{0.15\textwidth}
@@ -114,9 +114,9 @@
 \blocknode{}{
 \bigskip
 
+}
 
 
-
 \startthirdcolumn
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \blocknode{}{