fix openmp issue caused by last commit

sdhzhs · Nov 7, 2021 · 78d2e01 · 78d2e01
1 parent 39d71d0
commit 78d2e01
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/Condiff.f03 b/lib/Condiff.f03
@@ -40,17 +40,25 @@ Subroutine Condiff(scalar)
  !$OMP WORKSHARE
  F=T
  Ga=ka/ca+mut/Prt
+ !$OMP END WORKSHARE
  if(Tmptype=='fixed') then
+  !$OMP WORKSHARE
   Fwall=Tf
+  !$OMP END WORKSHARE
  else if(Tmptype=='flux') then
   if(Walltreat=='wf') then
+   !$OMP WORKSHARE
    Fwall=T(Ib1:Ib2,1)+Qf*Tplus/(ca*rho(Ib1:Ib2,1)*ustar)
+   !$OMP END WORKSHARE
   else
+   !$OMP WORKSHARE
    Fwall=T(Ib1:Ib2,1)+Qf*Yp/(ca*Ga(Ib1:Ib2,1))
+   !$OMP END WORKSHARE
   end if
+  !$OMP SINGLE
   Tf=Fwall((Ib1+Ib2)/2)
+  !$OMP END SINGLE
  end if
- !$OMP END WORKSHARE
 else if(scalar=='Tn') then
  !$OMP WORKSHARE
  F=Tn

diff --git a/lib/Wallfunc.f03 b/lib/Wallfunc.f03
@@ -68,6 +68,7 @@ Subroutine Wallfunc
     if(wallfunutype=='parvel') then
      Dl=0.5*rho(i,1)*ustar(i)*Pr(i,1)*(Un(i,1)/da(i,1))**2
      Dt=0.5*rho(i,1)*ustar(i)*(Prt*(Un(i,1)/da(i,1))**2+(Pr(i,1)-Prt)*(Yt*ustar(i))**2)
+     !Dt=0.5*rho(i,1)*ustar(i)*Prt*(Un(i,1)/da(i,1))**2*10
     else
      Dl=0.5*rho(i,1)*ustar(i)*Pr(i,1)*(U(i,1)**2+V(i,1)**2)
      Dt=0.5*rho(i,1)*ustar(i)*(Prt*(U(i,1)**2+V(i,1)**2)+(Pr(i,1)-Prt)*(Yt*ustar(i))**2)