Changeset adf46ae in flexpart.git for src/par_mod.f90

Timestamp:

Oct 22, 2015, 4:55:33 PM (9 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:

ca350ba, 4d45639

Parents:

c04b739

Message:

Added module gfs_mod / ecmwf_mod to allow compilation of different versions without editing source code

File:

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

src/par_mod.f90

@@ -33 +33 @@
 
 module par_mod
+
+! wind_mod: is gfs_mod.f90 for target gfs, ecmwf_mod.f90 for target ecmwf
+!************************************************************************
+  use wind_mod 
 
   implicit none
@@ -122 +126 @@
   !*********************************************
   
+  ! nxmax,nymax,nuvzmax,nwzmax,nzmax:
+  ! Moved to ecmwf.f90 (for ECMWF) / gfs.f90 (GFS)
+  
+
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !FNL XF
-  integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new 
+  !integer,parameter :: nxmax=361,nymax=181,nuvzmax=152,nwzmax=152,nzmax=152 !ECMWF new 
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=92,nwzmax=92,nzmax=92 !ECMWF
   !integer,parameter :: nxmax=361,nymax=181,nuvzmax=26,nwzmax=26,nzmax=26
@@ -129 +137 @@
   !integer,parameter :: nxmax=1201,nymax=235,nuvzmax=58,nwzmax=58,nzmax=58
 
-  integer,parameter :: nxshift=359 ! for ECMWF
+!  integer,parameter :: nxshift=359 ! for ECMWF
   !integer,parameter :: nxshift=0     ! for GFS or FNL
 
@@ -135 +143 @@
   integer,parameter :: na = nconvlevmax+1
 
-
+  ! moved to gfs_mod.f90 / ecmwf_mod.f90
+  !
   ! nxmax,nymax        maximum dimension of wind fields in x and y
   !                    direction, respectively
@@ -146 +155 @@
   !                    grids, and output grids overlapping the domain "boundary"
   !                    nxshift must not be negative; "normal" setting would be 0
+
   ! ntracermax         maximum number of tracer species in convection
   ! nconvlevmax        maximum number of levels for convection
@@ -156 +166 @@
 
   !integer,parameter :: maxnests=0, nxmaxn=0, nymaxn=0
-  integer,parameter :: maxnests=1,nxmaxn=351,nymaxn=351 !ECMWF
+  integer,parameter :: maxnests=0,nxmaxn=351,nymaxn=351 !ECMWF
 
   !integer,parameter :: maxnests=1, nxmaxn=201, nymaxn=161 ! FNL XF
@@ -200 +210 @@
   !**************************************************
 
-  integer,parameter :: maxpart=50000000
+  integer,parameter :: maxpart=60000000
 !  integer,parameter :: maxpart=60000000
 !  integer,parameter :: maxpart=120000000
-  integer,parameter :: maxspec=1
+  integer,parameter :: maxspec=6
 
   ! maxpart                 Maximum number of particles
@@ -271 +281 @@
   integer,parameter :: unitdates=94, unitheader=90,unitheader_txt=100, unitshortpart=95
   integer,parameter :: unitboundcond=89
+  integer,parameter :: unittmp=101
 
 !******************************************************