Changeset 1070b4c in flexpart.git for src/timemanager_mpi.f90

Timestamp:

Aug 27, 2020, 9:51:56 PM (4 years ago)

Author:

Espen Sollum ATMOS <eso@…>

Branches:

GFS_025, dev

Children:

b0ecb61

Parents:

8c0ae9b (diff), a803521 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'espen' into dev

File:

• src/timemanager_mpi.f90 (modified) (10 diffs)

src/timemanager_mpi.f90

@@ -91 +91 @@
   implicit none
 
+  integer(selected_int_kind(16)) :: idummy,idummy2
   integer :: metdata_format
   logical :: reqv_state=.false. ! .true. if waiting for a MPI_Irecv to complete
@@ -97 +98 @@
   integer :: ip,irec
   integer :: loutnext,loutstart,loutend
-  integer :: ix,jy,ldeltat,itage,nage,idummy
+  integer :: ix,jy,ldeltat,itage,nage
   integer :: i_nan=0,ii_nan,total_nan_intl=0  !added by mc to check instability in CBL scheme 
   integer :: numpart_tot_mpi ! for summing particles on all processes
@@ -159 +160 @@
 !********************************************************************
 
-    if (mp_dbg_mode) write(*,*) 'myid, itime: ',mp_pid,itime
+!    if (mp_dbg_mode) write(*,*) 'myid, itime: ',mp_pid,itime
     
     if (WETDEP .and. itime .ne. 0 .and. numpart .gt. 0) then
@@ -280 +281 @@
 
     if (lmpreader.and.lmp_use_reader) then
-      if (itime.lt.ideltas*ldirect) then
+      if (abs(itime).lt.ideltas*ldirect) then
         cycle
       else
@@ -480 +481 @@
               creceptor(:,:)=0.
             end if
-          else 
+          else ! surf only 
             if (lroot) then
               if (lnetcdfout.eq.1) then
@@ -488 +489 @@
 #endif
               else
-                call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
+                if (linversionout.eq.1) then
+                  call concoutput_inversion(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
+                else
+                  call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
+                end if
               end if
             else
@@ -516 +521 @@
 
               else
-                call concoutput_surf_nest(itime,outnum)
+                if(linversionout.eq.1) then
+                  if (lroot) then
+                    call concoutput_inversion_nest(itime,outnum)
+                  else
+                    griduncn(:,:,:,:,:,:,:)=0.
+                  end if
+                else
+                  if (lroot) then
+                    call concoutput_surf_nest(itime,outnum)
+                  else
+                    griduncn(:,:,:,:,:,:,:)=0.
+                  end if
+                end if
               end if
             else
@@ -724 +741 @@
        do ks=1,nspec
          if  ((xscav_frac1(j,ks).lt.0)) then
-            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)
+            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy2,wetscav)
             if (wetscav.gt.0) then
                 xscav_frac1(j,ks)=wetscav* &
@@ -877 +894 @@
 !*****************************************************************************
 
-! eso :TODO: this not implemented yet (transfer particles to PID 0 or rewrite)
-! the tools to do this are already in mpi_mod.f90
-  if (lroot) then 
-    do j=1,numpart
-      if (linit_cond.ge.1) call initial_cond_calc(itime,j)
-    end do
-  end if
-
-
+  do j=1,numpart
+    if (linit_cond.ge.1) call initial_cond_calc(itime,j)
+  end do
+
+! Transfer sum of init_cond field to root process, for output
+  call mpif_tm_reduce_initcond
+    
   if (ipout.eq.2) then
 ! MPI process 0 creates the file, the other processes append to it
@@ -897 +912 @@
   end if
 
-! eso :TODO: MPI
-  if (linit_cond.ge.1.and.lroot) call initial_cond_output(itime)   ! dump initial cond. field
+  
+  if (linit_cond.ge.1.and.lroot) then
+    if(linversionout.eq.1) then
+      call initial_cond_output_inversion(itime)   ! dump initial cond. field
+    else
+      call initial_cond_output(itime)   ! dump initial cond. fielf
+    endif
+  endif