Changes in src/timemanager_mpi.f90 [f3054ea:92fab65] in flexpart.git

File:

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

src/timemanager_mpi.f90

@@ -1 @@
-!**********************************************************************
-! Copyright 1998,1999,2000,2001,2002,2005,2007,2008,2009,2010         *
-! Andreas Stohl, Petra Seibert, A. Frank, Gerhard Wotawa,             *
-! Caroline Forster, Sabine Eckhardt, John Burkhart, Harald Sodemann   *
-!                                                                     *
-! This file is part of FLEXPART.                                      *
-!                                                                     *
-! FLEXPART is free software: you can redistribute it and/or modify    *
-! it under the terms of the GNU General Public License as published by*
-! the Free Software Foundation, either version 3 of the License, or   *
-! (at your option) any later version.                                 *
-!                                                                     *
-! FLEXPART is distributed in the hope that it will be useful,         *
-! but WITHOUT ANY WARRANTY; without even the implied warranty of      *
-! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the       *
-! GNU General Public License for more details.                        *
-!                                                                     *
-! You should have received a copy of the GNU General Public License   *
-! along with FLEXPART.  If not, see <http://www.gnu.org/licenses/>.   *
-!**********************************************************************
+! SPDX-FileCopyrightText: FLEXPART 1998-2019, see flexpart_license.txt
+! SPDX-License-Identifier: GPL-3.0-or-later
 
 subroutine timemanager(metdata_format)
@@ -109 +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
@@ -116 +97 @@
   integer :: ip,irec
   integer :: loutnext,loutstart,loutend
-  integer :: ix,jy,ldeltat,itage,nage
+  integer :: ix,jy,ldeltat,itage,nage,idummy
   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
@@ -178 +159 @@
 !********************************************************************
 
-!    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
@@ -299 +280 @@
 
     if (lmpreader.and.lmp_use_reader) then
-      if (abs(itime).lt.ideltas*ldirect) then
+      if (itime.lt.ideltas*ldirect) then
         cycle
       else
@@ -499 +480 @@
               creceptor(:,:)=0.
             end if
-          else ! surf only 
+          else 
             if (lroot) then
               if (lnetcdfout.eq.1) then
@@ -507 +488 @@
 #endif
               else
-                if (linversionout.eq.1) then
-                  call concoutput_inversion(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
-                else
-                  call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
-                end if
+                call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
               end if
             else
@@ -539 +516 @@
 
               else
-                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
+                call concoutput_surf_nest(itime,outnum)
               end if
             else
@@ -759 +724 @@
        do ks=1,nspec
          if  ((xscav_frac1(j,ks).lt.0)) then
-            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy2,wetscav)
+            call get_wetscav(itime,lsynctime,loutnext,j,ks,grfraction,idummy,idummy,wetscav)
             if (wetscav.gt.0) then
                 xscav_frac1(j,ks)=wetscav* &
@@ -912 +877 @@
 !*****************************************************************************
 
-  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
-    
+! 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
+
+
   if (ipout.eq.2) then
 ! MPI process 0 creates the file, the other processes append to it
@@ -930 +897 @@
   end if
 
-  
-  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
+! eso :TODO: MPI
+  if (linit_cond.ge.1.and.lroot) call initial_cond_output(itime)   ! dump initial cond. field