Changeset d2a5a83 in flexpart.git

Timestamp:

Dec 4, 2017, 1:18:12 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:

01e6052

Parents:

0ecc1fe

Message:

Fixed an issue with allocation in previous commit

Location:

src

Files:

• outgrid_init.f90 (modified) (1 diff)
• outgrid_init_nest.f90 (modified) (1 diff)
• partoutput.f90 (modified) (1 diff)
• partoutput_mpi.f90 (modified) (1 diff)

src/outgrid_init.f90

@@ -234 +234 @@
   end if
 #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'
-  
+  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
-    allocate(wetgridunc0(1,1,1,1,1,1),stat=stat)
-    allocate(drygridunc0(1,1,1,1,1,1),stat=stat)
+    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
   end if
 

src/outgrid_init_nest.f90

@@ -83 +83 @@
   end if
 #endif
-!    if (ldirect.gt.0) then
-  if (lroot.and.mpi_mode.gt.0) then
-    allocate(wetgriduncn0(0:numxgridn-1,0:numygridn-1,maxspec, &
-         maxpointspec_act,nclassunc,maxageclass),stat=stat)
-    if (stat.ne.0) write(*,*)'ERROR:could not allocate nested gridunc'
-    allocate(drygriduncn0(0:numxgridn-1,0:numygridn-1,maxspec, &
-         maxpointspec_act,nclassunc,maxageclass),stat=stat)
-    if (stat.ne.0) write(*,*)'ERROR:could not allocate nested gridunc'
+  if (ldirect.gt.0) then
+    if (lroot.and.mpi_mode.gt.0) then
+      allocate(wetgriduncn0(0:numxgridn-1,0:numygridn-1,maxspec, &
+           maxpointspec_act,nclassunc,maxageclass),stat=stat)
+      if (stat.ne.0) write(*,*)'ERROR:could not allocate nested gridunc'
+      allocate(drygriduncn0(0:numxgridn-1,0:numygridn-1,maxspec, &
+           maxpointspec_act,nclassunc,maxageclass),stat=stat)
+      if (stat.ne.0) write(*,*)'ERROR:could not allocate nested gridunc'
 !  endif
 ! allocate a dummy to avoid compilator complaints
-  else if (.not.lroot.and.mpi_mode.gt.0) then
-    allocate(wetgriduncn0(1,1,1,1,1,1),stat=stat)
-    allocate(drygriduncn0(1,1,1,1,1,1),stat=stat)
+    else if (.not.lroot.and.mpi_mode.gt.0) then
+      allocate(wetgriduncn0(1,1,1,1,1,1),stat=stat)
+      allocate(drygriduncn0(1,1,1,1,1,1),stat=stat)
+    end if
   end if
 

src/partoutput.f90

@@ -108 +108 @@
       p3=rddx*ddy
       p4=ddx*ddy
+
+! eso: Temporary fix for particle exactly at north pole
+      if (jyp >= nymax) then
+      !  write(*,*) 'WARNING: conccalc.f90 jyp >= nymax'
+        jyp=jyp-1
+      end if
 
   ! Topography

src/partoutput_mpi.f90

@@ -115 +115 @@
       p3=rddx*ddy
       p4=ddx*ddy
+
+! eso: Temporary fix for particle exactly at north pole
+      if (jyp >= nymax) then
+      !  write(*,*) 'WARNING: conccalc.f90 jyp >= nymax'
+        jyp=jyp-1
+      end if
 
   ! Topography