Changeset 31674b5 in flexpart.git for src/advance.f90

Timestamp:

Jul 15, 2015, 9:45:11 AM (9 years ago)

Author:

Ignacio Pisso <Ignacio.Pisso@…>

Branches:

svn-petra

Children:

3c1da52

Parents:

480164e

git-author:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 09:19:44)

git-committer:

Ignacio Pisso <Ignacio.Pisso@…> (07/15/15 09:45:11)

Message:

from svn branch petra
r36 | pesei | 2015-02-16 19:21:09 +0100 (Mon, 16 Feb 2015) | 1 line
Changed paths:

A /branches/petra/changelog.txt
M /branches/petra/options/COMMAND
M /branches/petra/options/COMMAND.alternative
M /branches/petra/options/COMMAND.reference
M /branches/petra/options/surfdata.t
M /branches/petra/src/FLEXPART.f90
M /branches/petra/src/advance.f90
M /branches/petra/src/com_mod.f90
M /branches/petra/src/concoutput.f90
M /branches/petra/src/concoutput_nest.f90
M /branches/petra/src/concoutput_surf.f90
M /branches/petra/src/par_mod.f90
M /branches/petra/src/readcommand.f90
M /branches/petra/src/readpaths.f90
M /branches/petra/src/readreceptors.f90
M /branches/petra/src/readreleases.f90
M /branches/petra/src/readspecies.f90
M /branches/petra/src/readwind.f90
M /branches/petra/src/readwind_nests.f90
M /branches/petra/src/skplin.f90
M /branches/petra/src/writeheader.f90
M /branches/petra/src/writeheader_nest.f90
M /branches/petra/src/writeheader_txt.f90

Implement switch for incremental deposition, see ticket:113 and many small changes, see changelog.txt

File:

• src/advance.f90 (modified) (4 diffs)

src/advance.f90

@@ -1 +1 @@
 !**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
+! Copyright 1998-2015                                                 *
 ! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
 ! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
@@ -61 +61 @@
   !  8 April 2000: Deep convection parameterization                            *
   !                                                                            *
-  !  May 2002: Petterssen scheme introduced                                    *
+  !  May 2002: Petterssen scheme introduced  
+  !  PS, 2/2015: fix mixture of real and dp in call to funtion mod
   !                                                                            *
   !*****************************************************************************
@@ -707 +708 @@
 
   if ( yt.lt.0. ) then
-    xt=mod(xt+180.,360.)
+    xt=mod(xt+180._dp,360._dp)
     yt=-yt
   else if ( yt.gt.real(nymin1) ) then
-    xt=mod(xt+180.,360.)
+    xt=mod(xt+180._dp,360._dp)
     yt=2*real(nymin1)-yt
   endif
@@ -877 +878 @@
 
   if ( yt.lt.0. ) then
-    xt=mod(xt+180.,360.)
+    xt=mod(xt+180._dp,360._dp)
     yt=-yt
   else if ( yt.gt.real(nymin1) ) then
-    xt=mod(xt+180.,360.)
+    xt=mod(xt+180._dp,360._dp)
     yt=2*real(nymin1)-yt
   endif