Changeset 91ce5e7 in flexpart.git

Timestamp:

Mar 1, 2018, 8:42:46 AM (6 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:

1e991c1, ae43937

Parents:

7d02c2f (diff), 1f55de1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'dev' of git.nilu.no:flexpart/flexpart into dev

Location:

src

Files:

• makefile (modified) (2 diffs)
• par_mod.f90 (modified) (5 diffs)
• concoutput_nest.f90 (modified) (1 diff)

src/makefile

@@ -58 +58 @@
         LIBPATH1 = ${ROOT_DIR}/lib
 
-else ifeq ($(gcc), 5.4)
+else #ifeq ($(gcc), 5.4)
 # Compiled libraries under user ~flexpart, gfortran v5.4
         ROOT_DIR = /homevip/flexpart/
@@ -69 +69 @@
         LIBPATH1 = ${ROOT_DIR}/gcc-5.4.0/lib
 
-else
+#else
 # Default: System libraries at NILU, gfortran v4.6
-        F90       = /usr/bin/gfortran
-        MPIF90    = /usr/bin/mpif90.openmpi
-
-        INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
-        INCPATH2 = /usr/include
-        LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
+#       F90       = /usr/bin/gfortran
+#       MPIF90    = /usr/bin/mpif90.openmpi
+
+#       INCPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/include
+#       INCPATH2 = /usr/include
+#       LIBPATH1 = /xnilu_wrk/projects/FLEXPART/flex_wrk/bin64/grib_api/lib
 endif
 

src/par_mod.f90

@@ -148 +148 @@
   ! ECMWF
 ! integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=359 ! 1.0 degree 92 level
-   integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
+  integer,parameter :: nxmax=361,nymax=181,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359 ! 1.0 degree 138 level
 ! integer,parameter :: nxmax=721,nymax=361,nuvzmax=138,nwzmax=138,nzmax=138,nxshift=359  ! 0.5 degree 138 level
 !  integer,parameter :: nxmax=181,nymax=91,nuvzmax=92,nwzmax=92,nzmax=92,nxshift=0  ! CERA 2.0 degree 92 level
@@ -160 +160 @@
   !*********************************************
 
-  integer,parameter :: maxnests=1,nxmaxn=451,nymaxn=426
+  integer,parameter :: maxnests=0,nxmaxn=0,nymaxn=0
 
   ! nxmax,nymax        maximum dimension of wind fields in x and y
@@ -209 +209 @@
   !integer,parameter :: maxxgrid=361,maxygrid=181,maxxgridn=0,maxygridn=0)
 
-  integer,parameter :: maxreceptor=200
+  integer,parameter :: maxreceptor=20
 
   ! maxreceptor             maximum number of receptor points
@@ -218 +218 @@
   !**************************************************
 
-  integer,parameter :: maxpart=30000000
-  integer,parameter :: maxspec=6
+  integer,parameter :: maxpart=100000
+  integer,parameter :: maxspec=1
 
   real,parameter :: minmass=0.0001
@@ -262 +262 @@
   !*********************************
 
-  integer,parameter :: maxrand=200000000
+  integer,parameter :: maxrand=1000000
 
   ! maxrand                 number of random numbers used

src/concoutput_nest.f90

@@ -199 +199 @@
 
   write(anspec,'(i3.3)') ks
-  if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
-    if (ldirect.eq.1) then
-      open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_nest_' &
+ 
+  if (DRYBKDEP.or.WETBKDEP) then !scavdep output
+      if (DRYBKDEP) &
+      open(unitoutgrid,file=path(2)(1:length(2))//'grid_drydep_nest_'//adate// &
+           atime//'_'//anspec,form='unformatted')
+      if (WETBKDEP) &
+      open(unitoutgrid,file=path(2)(1:length(2))//'grid_wetdep_nest_'//adate// &
+           atime//'_'//anspec,form='unformatted')
+      write(unitoutgrid) itime
+  else
+     if ((iout.eq.1).or.(iout.eq.3).or.(iout.eq.5)) then
+       if (ldirect.eq.1) then
+         open(unitoutgrid,file=path(2)(1:length(2))//'grid_conc_nest_' &
            //adate// &
            atime//'_'//anspec,form='unformatted')
-    else
-      open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_nest_' &
+       else
+         open(unitoutgrid,file=path(2)(1:length(2))//'grid_time_nest_' &
            //adate// &
            atime//'_'//anspec,form='unformatted')
-    endif
-     write(unitoutgrid) itime
-   endif
+       endif
+       write(unitoutgrid) itime
+     endif
+  endif
 
   if ((iout.eq.2).or.(iout.eq.3)) then      ! mixing ratio