Changeset 1070b4c in flexpart.git for src/timemanager.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.f90 (modified) (5 diffs)

src/timemanager.f90

@@ -90 +90 @@
   implicit none
 
+  integer(selected_int_kind(16)) :: idummy,idummy2
   integer :: metdata_format
   integer :: j,ks,kp,l,n,itime=0,nstop,nstop1
 ! integer :: ksp
   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 
   real :: outnum,weight,prob_rec(maxspec),prob(maxspec),decfact,wetscav
@@ -379 +380 @@
               call concoutput(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
             endif
-          else  
+          else ! surf only  
             if (verbosity.eq.1) then
-             print*,'call concoutput_surf '
-             call system_clock(count_clock)
-             write(*,*) 'system clock',count_clock - count_clock0   
+              print*,'call concoutput_surf '
+              call system_clock(count_clock)
+              write(*,*) 'system clock',count_clock - count_clock0   
             endif
             if (lnetcdfout.eq.1) then
@@ -398 +399 @@
                 endif
               else
-              call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
+                call concoutput_surf(itime,outnum,gridtotalunc,wetgridtotalunc,drygridtotalunc)
               endif
               if (verbosity.eq.1) then
@@ -416 +417 @@
                   call concoutput_inversion_nest(itime,outnum)
                 else 
-                call concoutput_surf_nest(itime,outnum)
-              endif
+                  call concoutput_surf_nest(itime,outnum)
+                endif
               endif
             else
@@ -581 +582 @@
        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* &