Changeset 4c64400 in flexpart.git for src/netcdf_output_mod.f90

Timestamp:

Nov 8, 2016, 4:42:27 PM (7 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

master, 10.4.1_pesei, GFS_025, bugfixes+enhancements, dev, release-10, release-10.4.1, scaling-bug, univie

Children:

c8fc724

Parents:

16b61a5

Message:

Bugfix for double precision dry deposition calculation. Added (hardcoded) option to not use output kernel. Version/date string updated.

File:

• src/netcdf_output_mod.f90 (modified) (8 diffs)

src/netcdf_output_mod.f90

@@ -19 +19 @@
 !**********************************************************************
 
+
   !*****************************************************************************
   !                                                                            *
@@ -24 +25 @@
   !  residence time and wet and dry deposition output.                         *
   !                                                                            *
-  !  - writeheader_netcdf generates file including all information previously    *
+  !  - writeheader_netcdf generates file including all information previously  *
   !    stored in separate header files                                         *
-  !  - concoutput_netcdf write concentration output and wet and dry deposition   *
+  !  - concoutput_netcdf write concentration output and wet and dry deposition *
   !                                                                            *
   !     Author: D. Brunner                                                     *
@@ -893 +894 @@
   gridsigmatotal=0.
   gridtotalunc=0.
-  wetgridtotal=0.
-  wetgridsigmatotal=0.
-  wetgridtotalunc=0.
-  drygridtotal=0.
-  drygridsigmatotal=0.
-  drygridtotalunc=0.
+  wetgridtotal=0._dep_prec
+  wetgridsigmatotal=0._dep_prec
+  wetgridtotalunc=0._dep_prec
+  drygridtotal=0._dep_prec
+  drygridsigmatotal=0._dep_prec
+  drygridtotalunc=0._dep_prec
 
   do ks=1,nspec
@@ -922 +923 @@
                    wetgridsigma(ix,jy),nclassunc)
               ! Multiply by number of classes to get total concentration
-              wetgrid(ix,jy)=wetgrid(ix,jy)*real(nclassunc,kind=dep_prec)
+              wetgrid(ix,jy)=wetgrid(ix,jy)*real(nclassunc,kind=sp)
               wetgridtotal=wetgridtotal+wetgrid(ix,jy)
               ! Calculate standard deviation of the mean
@@ -946 +947 @@
                    drygridsigma(ix,jy),nclassunc)
               ! Multiply by number of classes to get total concentration
-              drygrid(ix,jy)=drygrid(ix,jy)*real(nclassunc)
+              drygrid(ix,jy)=drygrid(ix,jy)*real(nclassunc,kind=sp)
               drygridtotal=drygridtotal+drygrid(ix,jy)
               ! Calculate standard deviation of the mean
               drygridsigma(ix,jy)= &
                    drygridsigma(ix,jy)* &
-                   sqrt(real(nclassunc))
+                   sqrt(real(nclassunc, kind=dep_prec))
               drygridsigmatotal=drygridsigmatotal+ &
                    drygridsigma(ix,jy)
@@ -1054 +1055 @@
   if (wetgridtotal.gt.0.) wetgridtotalunc=wetgridsigmatotal/ &
        wetgridtotal
-  if (drygridtotal.gt.0.) drygridtotalunc=drygridsigmatotal/ &
-       drygridtotal
+  if (drygridtotal.gt.0.) drygridtotalunc=real(drygridsigmatotal/ &
+       drygridtotal, kind=dep_prec)
 
   ! Dump of receptor concentrations
@@ -1298 +1299 @@
               wetgridsigma(ix,jy)= &
                    wetgridsigma(ix,jy)* &
-                   sqrt(real(nclassunc))
+                   sqrt(real(nclassunc,kind=dep_prec))
             endif
 
@@ -1319 +1320 @@
               drygridsigma(ix,jy)= &
                    drygridsigma(ix,jy)* &
-                   sqrt(real(nclassunc))
+                   sqrt(real(nclassunc,kind=dep_prec))
             endif