Changeset 2111

Timestamp:

Mar 5, 2019, 2:04:30 PM (6 years ago)

Author:

emillour

Message:

Generic model:

• some fixes for the slab ocean. Still need to make it work in parallel.

EM

Location:

trunk/LMDZ.GENERIC

Files:

• README (modified) (1 diff)
• libf/phystd/surf_heat_transp_mod.F90 (modified) (5 diffs)

trunk/LMDZ.GENERIC/README

@@ -1465 +1465 @@
 == 26/02/2019 == AB
 - now convective adjustment can be used for layers beyond thermals
+
+== 05/03/2019 == EM
+- some fixes for the slab ocean. Still need to make it work in parallel.

trunk/LMDZ.GENERIC/libf/phystd/surf_heat_transp_mod.F90

@@ -32 +32 @@
   PRIVATE :: gr_fi_dyn, gr_dyn_fi
   ! Routines from dyn3d, valid on global dynamics grid only:
-  PRIVATE :: grad,diverg,gr_u_scal,gr_v_scal
+  PRIVATE :: grad,diverg,gr_v_scal,gr_scal_v,gr_scal_u
   
 CONTAINS
@@ -231 +231 @@
       ip1jmp1=(nbp_lon+1)*nbp_lat ! = iip1*jjp1
 
-! Passage taux,y sur grilles 2d
+! Convert taux,y to 2D  scalar grid
+      ! north and south poles tx,ty no meaning
+      tx_phy(1)=0.
+      tx_phy(ngrid)=0.
+      ty_phy(1)=0.
+      ty_phy(ngrid)=0.
       CALL gr_fi_dyn(1,ngrid,iip1,jjp1,tx_phy,txu)
       CALL gr_fi_dyn(1,ngrid,iip1,jjp1,ty_phy,tyu)
-! Passage grille u,v
-! Multiplication par f ou eps.
-      CALL gr_v_scal(1,txu,txv)
-      CALL gr_v_scal(1,tyu,tyv)
+          
+! Divide taux,y by f or eps, and convert to 2D u,v grids
+! (Arakawa C grid)
+      CALL gr_scal_v(1,txu,txv) ! wind stress at v points
+      CALL gr_scal_v(1,tyu,tyv)
       fluxm=tyv*unsev-txv*unsfv
 !      fluxm=-txv*unsfv
-      CALL gr_u_scal(1,txu,txu)
-      CALL gr_u_scal(1,tyu,tyu)
+! Zonal flux
+      CALL gr_scal_u(1,txu,txu) ! wind stress at u points
+      CALL gr_scal_u(1,tyu,tyu)
       fluxz=tyu*unsfu+txu*unseu
 !      fluxz=tyu*unsfu
             
-! Calcul de T, Tdeep
+! Convert temperature to 2D grid
       CALL gr_fi_dyn(2,ngrid,iip1,jjp1,ts_phy,ts)
        
@@ -263 +270 @@
       fluxv=fluxv
 
-!Calcul flux de chaleur méridiens
+! Meridional heat fluxes 
       DO ij=1,ip1jm
+          ! centered scheme
           fluxtm(ij,1)=fluxm(ij)*(ts(ij+iip1,1)+ts(ij,1))/2.
           fluxtm(ij,2)=-fluxm(ij)*(ts(ij+iip1,2)+ts(ij,2))/2.
       END DO
 
-!Calcul flux chaleur zonaux
+! Zonal heat fluxes
+! Schema upstream      
+      fluxtz(1:iip1,:)=0 ! no zonal heat flux at north pole
       DO ij=iip2,ip1jm
       IF (fluxz(ij).GE.0.) THEN
@@ -487 +497 @@
 
 
-  SUBROUTINE gr_u_scal(nx,x_u,x_scal)
-  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
-  IMPLICIT NONE
-  
-  INTEGER,INTENT(IN) :: nx
-  REAL,INTENT(IN) :: x_u((nbp_lon+1)*nbp_lat,nx)
-  REAL,INTENT(OUT) :: x_scal((nbp_lon+1)*nbp_lat,nx)
-  
-  INTEGER :: l,ij
-  INTEGER :: iip1,jjp1,ip1jmp1
-  
-  iip1=nbp_lon+1
-  jjp1=nbp_lat
-  ip1jmp1=(nbp_lon+1)*nbp_lat ! = iip1*jjp1
-  
-  DO l=1,nx
-    DO ij=ip1jmp1,2,-1
-      x_scal(ij,l)= &
-                   (aireu(ij)*x_u(ij,l)+aireu(ij-1)*x_u(ij-1,l)) &
-                  /(aireu(ij)+aireu(ij-1))
-    ENDDO
-  ENDDO
-  
-  CALL SCOPY(nx*jjp1,x_scal(iip1,1),iip1,x_scal(1,1),iip1)
-
-  END SUBROUTINE gr_u_scal
-
-
-
   SUBROUTINE gr_v_scal(nx,x_v,x_scal)
   USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
@@ -547 +528 @@
 
   END SUBROUTINE gr_v_scal
+
+  SUBROUTINE gr_scal_v(nx,x_scal,x_v)
+  ! convert values from scalar points to v points on C-grid
+  ! used to compute wind stress at V points
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
+  IMPLICIT NONE
+
+  INTEGER,INTENT(IN) :: nx ! number of levels or fields
+  REAL,INTENT(OUT) :: x_v((nbp_lon+1)*(nbp_lat-1),nx)
+  REAL,INTENT(IN) :: x_scal((nbp_lon+1)*nbp_lat,nx)
+
+  INTEGER :: l,ij
+  INTEGER :: iip1,ip1jm
+
+  iip1=nbp_lon+1
+  ip1jm=(nbp_lon+1)*(nbp_lat-1) ! = iip1*jjm
+
+      DO l=1,nx
+        DO ij=1,ip1jm
+          x_v(ij,l)= &
+            (cu(ij)*cvusurcu(ij)*x_scal(ij,l)+ &
+            cu(ij+iip1)*cvusurcu(ij+iip1)*x_scal(ij+iip1,l)) &
+            /(cu(ij)*cvusurcu(ij)+cu(ij+iip1)*cvusurcu(ij+iip1))
+        ENDDO
+      ENDDO
+
+  END SUBROUTINE gr_scal_v
+
+  SUBROUTINE gr_scal_u(nx,x_scal,x_u)
+  ! convert values from scalar points to U points on C-grid
+  ! used to compute wind stress at U points
+  USE mod_grid_phy_lmdz, ONLY: nbp_lon, nbp_lat
+  IMPLICIT NONE
+
+  INTEGER,INTENT(IN) :: nx
+  REAL,INTENT(OUT) :: x_u((nbp_lon+1)*nbp_lat,nx)
+  REAL,INTENT(IN) :: x_scal((nbp_lon+1)*nbp_lat,nx)
+
+  INTEGER :: l,ij
+  INTEGER :: iip1,jjp1,ip1jmp1
+
+  iip1=nbp_lon+1
+  jjp1=nbp_lat
+  ip1jmp1=(nbp_lon+1)*nbp_lat ! = iip1*jjp1
+
+  DO l=1,nx
+     DO ij=1,ip1jmp1-1
+        x_u(ij,l)= &
+         (aire(ij)*x_scal(ij,l)+aire(ij+1)*x_scal(ij+1,l)) &
+         /(aire(ij)+aire(ij+1))
+     ENDDO
+  ENDDO
+
+  CALL SCOPY(nx*jjp1,x_u(1,1),iip1,x_u(iip1,1),iip1)
+
+  END SUBROUTINE gr_scal_u
   
 END MODULE surf_heat_transp_mod