Changeset 1086 for trunk/LMDZ.COMMON/libf/dyn3d

Timestamp:

Oct 30, 2013, 9:39:51 AM (11 years ago)

Author:

slebonnois

Message:

SL: new way to deal with cpdet routines in dyn3d*... This one should work.

File:

• trunk/LMDZ.COMMON/libf/dyn3d/cpdet_mod.F90 (modified) (4 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/cpdet_mod.F90

@@ -1 @@
-      module cpdet_mod
-
-      implicit none
+module cpdet_mod
+
+implicit none
 
 ! ADAPTATION OF GCM TO CP(T)
@@ -17 +17 @@
 !======================================================================
 
-      contains
+contains
 
       SUBROUTINE ini_cpdet
@@ -134 +134 @@
 !======================================================================
 !======================================================================
+! Routines pour les calculs paralleles
+!======================================================================
+#ifdef CPP_PARA
+!======================================================================
+
+      SUBROUTINE t2tpot_p(nlon,nlev, yt, yteta, ypk)
+! Parallel version of t2tpot, for an arbitrary number of columns
+      USE control_mod, only : planet_type
+      IMPLICIT none
+
+! for cpp, nu_venus and t0_venus:
+#include "comconst.h"
+
+      integer,intent(in) :: nlon,nlev
+      real,intent(in) :: yt(nlon,nlev)
+      real,intent(out) :: yteta(nlon,nlev)
+      real,intent(in) :: ypk(nlon,nlev)
+! local variable:
+      integer :: l
+      
+      if (planet_type.eq."venus") then
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,nlev
+          yteta(:,l)=yt(:,l)**nu_venus                                  &
+     &                     -nu_venus*t0_venus**nu_venus*                &
+     &                          log(ypk(:,l)/cpp)
+          yteta(:,l)=yteta(:,l)**(1./nu_venus)
+        enddo
+!$OMP END DO
+      else
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,nlev
+          yteta(:,l)=yt(:,l)*cpp/ypk(:,l)
+        enddo
+!$OMP END DO
+      endif ! of if (planet_type.eq."venus")
+
+      end subroutine t2tpot_p
+
+!======================================================================
+!======================================================================
+
+      SUBROUTINE t2tpot_glo_p(yt, yteta, ypk)
+! Parallel version of t2tpot, over the full dynamics (scalar) grid
+! (more efficient than multiple calls to t2tpot_p() with slices of data)
+      USE parallel_lmdz, only : jj_begin,jj_end
+      USE control_mod, only : planet_type
+      IMPLICIT none
+! for iip1, jjp1 and llm
+#include "dimensions.h"
+#include "paramet.h"
+! for cpp, nu_venus and t0_venus:
+#include "comconst.h"
+
+      real,intent(in) :: yt(iip1,jjp1,llm)
+      real,intent(out) :: yteta(iip1,jjp1,llm)
+      real,intent(in) :: ypk(iip1,jjp1,llm)
+! local variable:
+      integer :: j,l
+      integer :: jjb,jje
+      
+      jjb=jj_begin
+      jje=jj_end
+
+      if (planet_type.eq."venus") then
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,llm
+          yteta(:,jjb:jje,l)=yt(:,jjb:jje,l)**nu_venus                  &
+     &                     -nu_venus*t0_venus**nu_venus*                &
+     &                          log(ypk(:,jjb:jje,l)/cpp)
+          yteta(:,jjb:jje,l)=yteta(:,jjb:jje,l)**(1./nu_venus)
+        enddo
+!$OMP END DO
+      else
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,llm
+          yteta(:,jjb:jje,l)=yt(:,jjb:jje,l)*cpp/ypk(:,jjb:jje,l)
+        enddo
+!$OMP END DO
+      endif ! of if (planet_type.eq."venus")
+
+      end subroutine t2tpot_glo_p
+
+!======================================================================
+!======================================================================
+
+      SUBROUTINE tpot2t_p(nlon,nlev,yteta,yt,ypk)
+! Parallel version of tpot2t, for an arbitrary number of columns
+      USE control_mod, only : planet_type
+      IMPLICIT none
+! for cpp, nu_venus and t0_venus:
+#include "comconst.h"
+
+      integer,intent(in) :: nlon,nlev
+      real,intent(out) :: yt(nlon,nlev)
+      real,intent(in) :: yteta(nlon,nlev)
+      real,intent(in) :: ypk(nlon,nlev)
+
+! local variable:
+      integer :: l
+
+      if (planet_type.eq."venus") then
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,nlev
+          yt(:,l)=yteta(:,l)**nu_venus                                  &
+     &                  +nu_venus*t0_venus**nu_venus*                   &
+     &                       log(ypk(:,l)/cpp)
+          yt(:,l)=yt(:,l)**(1./nu_venus)
+        enddo
+!$OMP END DO
+      else
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,nlev
+          yt(:,l)=yteta(:,l)*ypk(:,l)/cpp
+        enddo
+!$OMP END DO
+      endif ! of if (planet_type.eq."venus")
+      end subroutine tpot2t_p
+
+!======================================================================
+!======================================================================
+
+      SUBROUTINE tpot2t_glo_p(yteta,yt,ypk)
+! Parallel version of tpot2t, over the full dynamics (scalar) grid
+! (more efficient than multiple calls to tpot2t_p() with slices of data)
+      USE parallel_lmdz, only : jj_begin,jj_end
+      USE control_mod, only : planet_type
+      IMPLICIT none
+! for iip1, jjp1 and llm
+#include "dimensions.h"
+#include "paramet.h"
+! for cpp, nu_venus and t0_venus:
+#include "comconst.h"
+
+      real,intent(out) :: yt(iip1,jjp1,llm)
+      real,intent(in) :: yteta(iip1,jjp1,llm)
+      real,intent(in) :: ypk(iip1,jjp1,llm)
+! local variable:
+      integer :: j,l
+      integer :: jjb,jje
+      
+      jjb=jj_begin
+      jje=jj_end
+
+      if (planet_type.eq."venus") then
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,llm
+          yt(:,jjb:jje,l)=yteta(:,jjb:jje,l)**nu_venus                  &
+     &                  +nu_venus*t0_venus**nu_venus*                   &
+     &                       log(ypk(:,jjb:jje,l)/cpp)
+          yt(:,jjb:jje,l)=yt(:,jjb:jje,l)**(1./nu_venus)
+        enddo
+!$OMP END DO
+      else
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+        do l=1,llm
+          yt(:,jjb:jje,l)=yteta(:,jjb:jje,l)*ypk(:,jjb:jje,l)/cpp
+        enddo
+!$OMP END DO
+      endif ! of if (planet_type.eq."venus")
+      end subroutine tpot2t_glo_p
+
+!======================================================================
+#endif
+!======================================================================
+! Fin routines specifiques parallele
+!======================================================================
+!======================================================================
 !
 ! ATTENTION
@@ -142 +310 @@
 !======================================================================
 !======================================================================
-      end module cpdet_mod
+end module cpdet_mod