Changeset 4c52d0b in flexpart.git for src/timemanager.f90

Timestamp:

Apr 8, 2021, 9:27:43 AM (3 years ago)

Author:

Espen Sollum <eso@…>

Branches:

dev

Children:

b1f28c3

Parents:

aa939a9 (diff), 4138764 (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 'dev' into GFS_025

File:

• src/timemanager.f90 (modified) (2 diffs)

src/timemanager.f90

@@ -85 +85 @@
 #ifdef USE_NCF
   use netcdf_output_mod, only: concoutput_netcdf,concoutput_nest_netcdf,&
-       &concoutput_surf_netcdf,concoutput_surf_nest_netcdf
+       &concoutput_surf_netcdf,concoutput_surf_nest_netcdf,fluxoutput_netcdf
 #endif
 
@@ -433 +433 @@
         endif
         if ((iout.eq.4).or.(iout.eq.5)) call plumetraj(itime)
-        if (iflux.eq.1) call fluxoutput(itime)
+        if ((iflux.eq.1).and.(lnetcdfout.eq.0)) call fluxoutput(itime)
+#ifdef USE_NCF
+        if ((iflux.eq.1).and.(lnetcdfout.eq.1)) call fluxoutput_netcdf(itime)
+#endif
         write(*,45) itime,numpart,gridtotalunc,wetgridtotalunc,drygridtotalunc