Changeset f9ce123 in flexpart.git for src

Timestamp:

Apr 9, 2015, 3:33:01 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:

b5d0e7e

Parents:

6f3a20a

Message:

Added new parameter ohnconst for OH fields. Updated SPECIES files

Location:

src

Files:

• com_mod.f90 (modified) (1 diff)
• makefile (modified) (2 diffs)
• ohreaction.f90 (modified) (1 diff)
• readspecies.f90 (modified) (7 diffs)

src/com_mod.f90

@@ -163 +163 @@
   real :: rgs(maxspec,5,numclass),rlu(maxspec,5,numclass)
   real :: rm(maxspec),dryvel(maxspec),kao(maxspec)
-  real :: ohcconst(maxspec),ohdconst(maxspec)
+  real :: ohcconst(maxspec),ohdconst(maxspec),ohnconst(maxspec)
   ! se  it is possible to associate a species with a second one to make transfer from gas to aerosol
   integer :: spec_ass(maxspec)

src/makefile

@@ -34 +34 @@
 FLEXPART-GFS-MPI        = FP_gfs_MPI
 
+## Linker
+LD = ld.gold
+
 ## COMPILERS
-F90       = /usr/bin/gfortran
-#F90      = ${HOME}/gcc-4.9.1/bin/gfortran
+#F90       = /usr/bin/gfortran
+F90       = ${HOME}/gcc-4.9.1/bin/gfortran
 #MPIF90    = ${HOME}/opt/bin/mpifort
 #MPIF90    = mpif90.mpich
-MPIF90    = mpif90.openmpi
-#MPIF90    = mpifort
+#MPIF90    = mpif90.openmpi
+MPIF90    = mpifort
 
 ## OPTIMIZATION LEVEL
@@ -51 +54 @@
 ## 1) System libraries at NILU
 # INCPATH1 = /usr/include
-INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
-LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
+# INCPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/include
+# LIBPATH1 = /xnilu_wrk/flex_wrk/bin64/grib_api/lib
 # LIBPATH2 = /usr/lib/x86_64-linux-gnu
 
 ## 2) Home-made libraries
-#INCPATH2  = ${HOME}/include
-INCPATH2  = /homevip/flexpart/include
-LIBPATH2 = /homevip/flexpart/lib
-#INCPATH2 = ${HOME}/lib 
-
-FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) -mtune=native $(FUSER) # -march=native
+INCPATH1  = ${HOME}/include
+INCPATH2  = /homevip/flexpart/include/
+#LIBPATH2 = /homevip/flexpart/lib/
+LIBPATH1 = ${HOME}/lib
+LIBPATH2 = ${HOME}/lib  
+
+FFLAGS   = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV) -g -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV) -mtune=native -fuse-linker-plugin $(FUSER) # -march=native
+
 DBGFLAGS = -I$(INCPATH1) -I$(INCPATH2) -O$(O_LEV_DBG) -g3 -ggdb3 -m64 -mcmodel=medium -fconvert=little-endian -frecord-marker=4 -fmessage-length=0 -flto=jobserver -O$(O_LEV_DBG) -fbacktrace -Warray-bounds  -Wall -fcheck=all $(FUSER)  # -ffpe-trap=invalid,overflow,denormal,underflow,zero -fdump-core
 

src/ohreaction.f90

@@ -153 +153 @@
       do k=1,nspec                                
         if (ohcconst(k).gt.0.) then
-          ohrate=ohcconst(k)*temp**2*exp(-ohdconst(k)/temp)*oh_average
+          ohrate=ohcconst(k)*temp**ohnconst(k)*exp(-ohdconst(k)/temp)*oh_average
           ! new particle mass
           restmass = xmass1(jpart,k)*exp(-1*ohrate*abs(ltsample))

src/readspecies.f90

@@ -47 +47 @@
   ! ohcconst             OH reaction rate constant C                           *
   ! ohdconst             OH reaction rate constant D                           *
+  ! ohnconst             OH reaction rate constant n                           *
   ! id_spec              SPECIES number as referenced in RELEASE file          *
   ! id_pos               position where SPECIES data shall be stored           *
@@ -66 +67 @@
   character(len=16) :: pspecies
   real :: pdecay, pweta, pwetb, preldiff, phenry, pf0, pdensity, pdquer
-  real :: pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pspec_ass, pkao
+  real :: pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst, pspec_ass, pkao
   real :: pweta_in, pwetb_in, pwetc_in, pwetd_in
   integer :: readerror
@@ -75 +76 @@
        pweta_in, pwetb_in, pwetc_in, pwetd_in, &
        preldiff, phenry, pf0, pdensity, pdquer, &
-       pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pspec_ass, pkao
+       pdsigma, pdryvel, pweightmolar, pohcconst, pohdconst, pohnconst, pspec_ass, pkao
 
   pspecies=" "
@@ -94 +95 @@
   pohcconst=-9.99
   pohdconst=-9.9E-09
+  pohnconst=2.0
   pspec_ass=-9
   pkao=-99.99
@@ -160 +162 @@
     read(unitspecies,'(f8.2)',end=22) ohdconst(pos_spec)
 !  write(*,*) ohdconst(pos_spec)
+    read(unitspecies,'(f8.2)',end=22) ohnconst(pos_spec)
+!  write(*,*) ohnconst(pos_spec)
     read(unitspecies,'(i18)',end=22) spec_ass(pos_spec)
 !  write(*,*) spec_ass(pos_spec)
@@ -183 +187 @@
     pohcconst=ohcconst(pos_spec)
     pohdconst=ohdconst(pos_spec)
+    pohnconst=ohnconst(pos_spec)
     pspec_ass=spec_ass(pos_spec)
     pkao=kao(pos_spec)
@@ -206 +211 @@
     ohcconst(pos_spec)=pohcconst
     ohdconst(pos_spec)=pohdconst
+    ohdconst(pos_spec)=pohnconst
     spec_ass(pos_spec)=pspec_ass
     kao(pos_spec)=pkao