Changeset db712a8 in flexpart.git for src/mpi_mod.f90

Timestamp:

Mar 3, 2016, 12:34:56 PM (8 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:

38b7917

Parents:

b0434e1

Message:

Completed handling of nested wind fields with cloud water (for wet deposition).

File:

• src/mpi_mod.f90 (modified) (14 diffs)

src/mpi_mod.f90

@@ -860 +860 @@
 !   step
 !
-! TODO
-!   GFS version
 !
 !*******************************************************************************
@@ -922 +920 @@
 
 ! The non-reader processes need to know if cloud water were read.
-! TODO: only at first step or always?
     call MPI_Bcast(readclouds,1,MPI_LOGICAL,id_read,MPI_COMM_WORLD,mp_ierr)
     if (mp_ierr /= 0) goto 600 
@@ -1017 +1014 @@
     if (mp_ierr /= 0) goto 600 
 
-    call MPI_Bcast(z0,numclass,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
-    if (mp_ierr /= 0) goto 600 
-
     if (mp_measure_time) call mpif_mtime('commtime',1)
 
@@ -1045 +1039 @@
 !   step
 !
-! TODO
-!   Transfer cloud water/ice if and when available for nested
 !
 !***********************************************************************
@@ -1060 +1052 @@
 
 ! Common array sizes used for communications
-    integer :: d3_size1 = nxmaxn*nymaxn*nzmax*maxnests
-    integer :: d3_size2 = nxmaxn*nymaxn*nuvzmax*maxnests
-    integer :: d2_size1 = nxmaxn*nymaxn*maxnests
-    integer :: d2_size2 = nxmaxn*nymaxn*maxspec*maxnests
-    integer :: d2_size3 = nxmaxn*nymaxn*maxnests
+    integer :: d3_size1 = nxmaxn*nymaxn*nzmax
+    integer :: d3_size2 = nxmaxn*nymaxn*nuvzmax
+    integer :: d2_size1 = nxmaxn*nymaxn
+    integer :: d2_size2 = nxmaxn*nymaxn*maxspec
+    integer :: d2_size3 = nxmaxn*nymaxn
 
     integer :: d3s1,d3s2,d2s1,d2s2
@@ -1106 +1098 @@
 !**********************************************************************
 
+! The non-reader processes need to know if cloud water were read.
+    call MPI_Bcast(readclouds_nest,maxnests,MPI_LOGICAL,id_read,MPI_COMM_WORLD,mp_ierr)
+    if (mp_ierr /= 0) goto 600 
+
 ! Static fields/variables sent only at startup
     if (first_call) then
@@ -1120 +1116 @@
 
 ! MPI prefers contiguous arrays for sending (else a buffer is created),
-! hence the loop
-
+! hence the loop over nests
+!**********************************************************************
     do i=1, numbnests 
 ! 3D fields
@@ -1145 +1141 @@
       if (mp_ierr /= 0) goto 600 
       call MPI_Bcast(cloudsn(:,:,:,li:ui,i),d3s1,MPI_INTEGER1,id_read,MPI_COMM_WORLD,mp_ierr)
-      if (mp_ierr /= 0) goto 600 
+      if (mp_ierr /= 0) goto 600
+
+! cloud water/ice:
+    if (readclouds_nest(i)) then
+      ! call MPI_Bcast(icloud_stats(:,:,:,li:ui),d2s1*5,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
+      ! if (mp_ierr /= 0) goto 600
+      call MPI_Bcast(clw4n(:,:,li:ui,i),d2s1,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
+      if (mp_ierr /= 0) goto 600
+    end if
 
 ! 2D fields
-      call MPI_Bcast(cloudsnh(:,:,li:ui,i),d2s1,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
+      call MPI_Bcast(cloudshn(:,:,li:ui,i),d2s1,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
       if (mp_ierr /= 0) goto 600
       call MPI_Bcast(vdepn(:,:,:,li:ui,i),d2s2,mp_sp,id_read,MPI_COMM_WORLD,mp_ierr)
@@ -1206 +1210 @@
 !   mind    -- index where to place new fields
 !
-! TODO
 !
 !*******************************************************************************
@@ -1392 +1395 @@
 !   memstat -- input, used to resolve windfield index being received
 !
-! TODO
 !
 !*******************************************************************************
@@ -2019 +2021 @@
 ! In the implementation with 3 fields, the processes may have posted
 ! MPI_Irecv requests that should be cancelled here
-!! TODO:
 ! if (.not.lmp_sync) then
 !   r=mp_pid*nvar_async
@@ -2105 +2106 @@
 !   
 !
-! TODO
 !
 !*******************************************************************************
@@ -2132 +2132 @@
     uu(:,:,:,li:ui) = 10.0
     vv(:,:,:,li:ui) = 0.0
-    uupol(:,:,:,li:ui) = 10.0 ! TODO check if ok
+    uupol(:,:,:,li:ui) = 10.0
     vvpol(:,:,:,li:ui)=0.0
     ww(:,:,:,li:ui)=0.
@@ -2164 +2164 @@
     tropopause(:,:,:,li:ui)=10000.
     oli(:,:,:,li:ui)=0.01
-    z0=1.0
  
   end subroutine set_fields_synthetic