Changeset 624 for codes/icosagcm/devel/src/kernels_unst/caldyn_vert.k90

Timestamp:

12/08/17 15:08:49 (6 years ago)

Author:

dubos

Message:

devel : introduced kernels for caldyn_vert (optional)

File:

• codes/icosagcm/devel/src/kernels_unst/caldyn_vert.k90 (modified) (2 diffs)

codes/icosagcm/devel/src/kernels_unst/caldyn_vert.k90

@@ -1 +1 @@
    !--------------------------------------------------------------------------
    !---------------------------- caldyn_vert ----------------------------------
-   !$OMP DO SCHEDULE(STATIC)
-   DO ij=1,primal_num
-      DO l = llm-1,1,-1
-         ! cumulate mass flux convergence from top to bottom
-         convm(l,ij) = convm(l,ij) + convm(l+1,ij)
-      END DO
-      l=1
-      dmass_col(ij) = convm(l,ij)
-      DO l = 2,llm
-         ! Compute vertical mass flux (l=1,llm+1 set to zero at init)
-         wflux(l,ij) = mass_bl(l,ij) * dmass_col(ij) - convm(l,ij)
-      END DO
-   END DO
-   !$OMP END DO
-   ! make sure wflux is up to date
-   !$OMP BARRIER
-   !$OMP DO SCHEDULE(STATIC)
-   DO edge = 1, edge_num
-      ij_left = left(edge)
-      ij_right = right(edge)
-      DO l = 2, llm
-         wwuu(l,edge) = .5*(wflux(l,ij_left)+wflux(l,ij_right))*(u(l,edge)-u(l-1,edge))
-      END DO
-   END DO
-   !$OMP END DO
-   ! make sure wwuu is up to date
-   !$OMP BARRIER
-   !$OMP DO SCHEDULE(STATIC)
-   DO ij = 1, primal_num
-      DO l = 1, llm
-         convm(l,ij) = mass_dbk(l,ij) * dmass_col(ij) ! FIXME : we shoud prognose mass_col
-      END DO
-   END DO
-   !$OMP END DO
-   !$OMP DO SCHEDULE(STATIC)
-   DO edge = 1, edge_num
-      ij_left = left(edge)
-      ij_right = right(edge)
-      DO l = 1, llm
-         du(l,edge) = du(l,edge) - (wwuu(l,edge)+wwuu(l+1,edge)) / (rhodz(l,ij_left)+rhodz(l,ij_right))
-      END DO
-   END DO
-   !$OMP END DO
    DO iq=1,nqdyn
       !$OMP DO SCHEDULE(STATIC)
@@ -60 +17 @@
       !$OMP END DO
    END DO
+   IF(caldyn_vert_variant == caldyn_vert_cons) THEN
+      ! conservative vertical transport of momentum : (F/m)du/deta = 1/m (d/deta(Fu)-u.dF/deta)
+      !$OMP DO SCHEDULE(STATIC)
+      DO edge = 1, edge_num
+         ij_left = left(edge)
+         ij_right = right(edge)
+         DO l = 2, llm
+            wwuu(l,edge) = .25*(wflux(l,ij_left)+wflux(l,ij_right))*(u(l,edge)+u(l-1,edge)) ! Fu
+         END DO
+      END DO
+      !$OMP END DO
+      ! make sure wwuu is up to date
+      !$OMP BARRIER
+      !$OMP DO SCHEDULE(STATIC)
+      DO edge = 1, edge_num
+         ij_left = left(edge)
+         ij_right = right(edge)
+         DO l = 1, llm
+            dFu_deta = wwuu(l+1,edge)-wwuu(l,edge) ! d/deta (F*u)
+            dF_deta = .5*(wflux(l+1,ij_left)+wflux(l+1,ij_right)-(wflux(l,ij_left)+wflux(l,ij_right))) ! d/deta(F)
+            du(l,edge) = du(l,edge) - (dFu_deta-u(l,edge)*dF_deta) / (.5*(rhodz(l,ij_left)+rhodz(l,ij_right))) ! (F/m)du/deta
+         END DO
+      END DO
+      !$OMP END DO
+   ELSE
+      !$OMP DO SCHEDULE(STATIC)
+      DO edge = 1, edge_num
+         ij_left = left(edge)
+         ij_right = right(edge)
+         DO l = 2, llm
+            wwuu(l,edge) = .5*(wflux(l,ij_left)+wflux(l,ij_right))*(u(l,edge)-u(l-1,edge))
+         END DO
+      END DO
+      !$OMP END DO
+      ! make sure wwuu is up to date
+      !$OMP BARRIER
+      !$OMP DO SCHEDULE(STATIC)
+      DO edge = 1, edge_num
+         ij_left = left(edge)
+         ij_right = right(edge)
+         DO l = 1, llm
+            du(l,edge) = du(l,edge) - (wwuu(l,edge)+wwuu(l+1,edge)) / (rhodz(l,ij_left)+rhodz(l,ij_right))
+         END DO
+      END DO
+      !$OMP END DO
+   END IF
    !---------------------------- caldyn_vert ----------------------------------
    !--------------------------------------------------------------------------