Minor fixes for scalar transport.

src/chkdt.f90

@@ -69,6 +69,7 @@ subroutine chkdt(n,dl,dzci,dzfi,is_solve_ns,mu12,rho12,sigma,gacc,u,v,w,dtmax,ga
     !$acc wait(1)
     call MPI_ALLREDUCE(MPI_IN_PLACE,dti,1,MPI_REAL_RP,MPI_MAX,MPI_COMM_WORLD,ierr)
     dtipsi = gam*seps/dlmin**2
+    if(dtipsi == 0.) dtipsi = 1.
     if(.not.is_solve_ns) then
       dtmax = min(dti**(-1),dtipsi**(-1))
     else

src/initflow.f90

@@ -328,7 +328,7 @@ subroutine initscal(inisca,bcsca,ng,lo,l,dl,dzf,zc,s)
     sref = 1.
     sref = 0.5*(bcsca(0,3)+bcsca(1,3))
     select case(trim(inisca))
-    case('cou')
+    case('cou','dhc')
       call couette(   n(3),zc/l(3),1._rp,s1d)
       s1d(:) = s1d(:) + 0.5 ! from 0 to 1
       s1d(:) = bcsca(0,3)*(1.-s1d(:)) + bcsca(1,3)*(s1d(:))

src/main.f90

@@ -118,7 +118,7 @@ program cans
   integer  :: savecounter
   character(len=7  ) :: fldnum
   character(len=4  ) :: chkptnum
-  character(len=100) :: filename,fexts(5)
+  character(len=100) :: filename,fexts(6)
   integer :: k,kk
   logical :: is_done,kill
   real(rp), dimension(2) :: tm_coeff
@@ -308,9 +308,9 @@ program cans
   !
   write(fldnum,'(i7.7)') istep
   !$acc update self(u,v,w,p,psi,kappa)
-  include 'out1d.h90'
-  include 'out2d.h90'
-  include 'out3d.h90'
+#include "out1d.h90"
+#include "out2d.h90"
+#include "out3d.h90"
   !
   call chkdt(n,dl,dzci,dzfi,is_solve_ns,mu12,rho12,sigma,gacc,u,v,w,dtmax,gam,seps,ka12,cp12)
   dt = min(cfl*dtmax,dtmin)
@@ -435,15 +435,15 @@ program cans
     write(fldnum,'(i7.7)') istep
     if(mod(istep,iout1d) == 0) then
       !$acc update self(u,v,w,p,psi,kappa)
-      include 'out1d.h90'
+#include "out1d.h90"
     end if
     if(mod(istep,iout2d) == 0) then
       !$acc update self(u,v,w,p,psi,kappa)
-      include 'out2d.h90'
+#include "out2d.h90"
     end if
     if(mod(istep,iout3d) == 0) then
       !$acc update self(u,v,w,p,psi,kappa)
-      include 'out3d.h90'
+#include "out3d.h90"
     end if
     if(mod(istep,isave ) == 0.or.(is_done.and..not.kill)) then
       if(is_overwrite_save) then

src/out3d.h90

@@ -43,3 +43,8 @@
   call write_visu_3d(datadir,'cur_fld_'//fldnum//'.bin','log_visu_3d.out','Kappa', &
                      [1,1,1],[ng(1),ng(2),ng(3)],[1,1,1],time,istep, &
                      kappa(1:n(1),1:n(2),1:n(3)))
+#if defined(_SCALAR)
+  call write_visu_3d(datadir,'sca_fld_'//fldnum//'.bin','log_visu_3d.out','Temperature', &
+                     [1,1,1],[ng(1),ng(2),ng(3)],[1,1,1],time,istep, &
+                     s(1:n(1),1:n(2),1:n(3)))
+#endif

src/rk.f90

@@ -144,6 +144,7 @@ subroutine rk_scal(rkpar,n,dli,dzci,dzfi,dt, &
     factor1 = rkpar(1)*dt
     factor2 = rkpar(2)*dt
     factor12 = factor1 + factor2
+    rhocp12 = rho12(:)*cp12(:)
     if(is_first) then ! leverage save attribute to allocate these arrays on the device only once
       is_first = .false.
       allocate(dsdtrk_t(n(1),n(2),n(3)),dsdtrko_t(n(1),n(2),n(3)))