Changeset 8a65cb0 in flexpart.git for src/outgrid_init.f90

Timestamp:

Mar 2, 2015, 3:11:55 PM (9 years ago)

Author:

Espen Sollum ATMOS <espen@…>

Branches:

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

Children:

1d207bb

Parents:

60403cd

Message:

Added code, makefile for dev branch

File:

• src/outgrid_init.f90 (modified) (2 diffs)

src/outgrid_init.f90

@@ -200 +200 @@
   endif
 
-  !write (*,*) 'allocating: in a sec',OHREA
-  if (OHREA.eqv..TRUE.) then
-  !   write (*,*) 'allocating: ',maxxOH,maxyOH,maxzOH
-    allocate(OH_field(12,0:maxxOH-1,0:maxyOH-1,maxzOH) &
-         ,stat=stat)
-    if (stat.ne.0) write(*,*)'ERROR: could not allocate OH array '
-    allocate(OH_field_height(7) &
-         ,stat=stat)
-    if (stat.ne.0) write(*,*)'ERROR: could not allocate OH array '
-  endif
   ! gridunc,griduncn        uncertainty of outputted concentrations
   allocate(gridunc(0:numxgrid-1,0:numygrid-1,numzgrid,maxspec, &
@@ -222 +212 @@
     if (stat.ne.0) write(*,*)'ERROR: could not allocate gridunc'
   endif
+
+! Extra field for totals at MPI root process
+  if (lroot.and.mpi_mode.gt.0) then
+    ! allocate(gridunc0(0:numxgrid-1,0:numygrid-1,numzgrid,maxspec, &
+    !      maxpointspec_act,nclassunc,maxageclass),stat=stat)
+    ! if (stat.ne.0) write(*,*)'ERROR: could not allocate gridunc0'
+    if (ldirect.gt.0) then
+      allocate(wetgridunc0(0:numxgrid-1,0:numygrid-1,maxspec, &
+           maxpointspec_act,nclassunc,maxageclass),stat=stat)
+      if (stat.ne.0) write(*,*)'ERROR: could not allocate wetgridunc0'
+      allocate(drygridunc0(0:numxgrid-1,0:numygrid-1,maxspec, &
+           maxpointspec_act,nclassunc,maxageclass),stat=stat)
+      if (stat.ne.0) write(*,*)'ERROR: could not allocate drygridunc0'
+    endif
+! allocate a dummy to avoid compilator complaints
+  else if (.not.lroot.and.mpi_mode.gt.0) then
+    allocate(wetgridunc0(1,1,1,1,1,1),stat=stat)
+    allocate(drygridunc0(1,1,1,1,1,1),stat=stat)
+  end if
+
   !write (*,*) 'Dimensions for fields', numxgrid,numygrid, &
   !     maxspec,maxpointspec_act,nclassunc,maxageclass
 
-  write (*,*) 'Allocating fields for global output (x,y): ', numxgrid,numygrid
-  write (*,*) 'Allocating fields for nested output (x,y): ', numxgridn,numygridn 
+  if (lroot) then
+    write (*,*) 'Allocating fields for global output (x,y): ', numxgrid,numygrid
+    write (*,*) 'Allocating fields for nested output (x,y): ', numxgridn,numygridn 
+  end if
 
   ! allocate fields for concoutput with maximum dimension of outgrid