Changeset 0ecc1fe in flexpart.git for src/outgrid_init.f90

Timestamp:

Nov 30, 2017, 4:04:54 PM (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:

d2a5a83

Parents:

c2bd55e

Message:

Changed handling of nested input fields to be consistent with non-nested

File:

• src/outgrid_init.f90 (modified) (1 diff)

src/outgrid_init.f90

@@ -210 +210 @@
   allocate(gridunc(0:numxgrid-1,0:numygrid-1,numzgrid,maxspec, &
        maxpointspec_act,nclassunc,maxageclass),stat=stat)
-    if (stat.ne.0) write(*,*)'ERROR: could not allocate gridunc'
+  if (stat.ne.0) write(*,*)'ERROR: could not allocate gridunc'
   if (ldirect.gt.0) then
     allocate(wetgridunc(0:numxgrid-1,0:numygrid-1,maxspec, &
-       maxpointspec_act,nclassunc,maxageclass),stat=stat)
+         maxpointspec_act,nclassunc,maxageclass),stat=stat)
     if (stat.ne.0) write(*,*)'ERROR: could not allocate wetgridunc'
-  allocate(drygridunc(0:numxgrid-1,0:numygrid-1,maxspec, &
-       maxpointspec_act,nclassunc,maxageclass),stat=stat)
+    allocate(drygridunc(0:numxgrid-1,0:numygrid-1,maxspec, &
+         maxpointspec_act,nclassunc,maxageclass),stat=stat)
     if (stat.ne.0) write(*,*)'ERROR: could not allocate drygridunc'
   endif
 
+#ifdef USE_MPIINPLACE
+#else
 ! Extra field for totals at MPI root process
   if (lroot.and.mpi_mode.gt.0) then
-
-#ifdef USE_MPIINPLACE
-#else
-    ! If MPI_IN_PLACE option is not used in mpi_mod.f90::mpif_tm_reduce_grid(),
-    ! then an aux array is needed for parallel grid reduction
+! If MPI_IN_PLACE option is not used in mpi_mod.f90::mpif_tm_reduce_grid(),
+! then an aux array is needed for parallel grid reduction
     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'
+  else if (.not.lroot.and.mpi_mode.gt.0) then
+    allocate(gridunc0(1,1,1,1,1,1,1),stat=stat)
+    if (stat.ne.0) write(*,*)'ERROR: could not allocate gridunc0'
+  end if
 #endif
-    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
+!  if (ldirect.gt.0) then
+  if (lroot.and.mpi_mode.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'
+  
 ! allocate a dummy to avoid compilator complaints
   else if (.not.lroot.and.mpi_mode.gt.0) then