Changeset 2135 for trunk/LMDZ.COMMON/libf/dyn3d_common/cpdet_mod.F90

Timestamp:

May 3, 2019, 1:10:27 PM (6 years ago)

Author:

slebonnois

Message:

SL, Venus: new keys for flexibility cp0/cp(T) and Held-Suarez type physics

File:

• trunk/LMDZ.COMMON/libf/dyn3d_common/cpdet_mod.F90 (modified) (20 diffs)

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

@@ -21 +21 @@
       SUBROUTINE ini_cpdet
       
-      USE control_mod, ONLY: planet_type 
+      USE control_mod, ONLY: cpofT 
       USE comconst_mod, ONLY: nu_venus,t0_venus
       IMPLICIT none
@@ -28 +28 @@
 !======================================================================
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
           nu_venus=0.35
           t0_venus=460.
@@ -44 +44 @@
       FUNCTION cpdet(t)
 
-      USE control_mod, ONLY: planet_type 
+      USE control_mod, ONLY: cpofT 
       USE comconst_mod, ONLY: cpp,t0_venus,nu_venus
       IMPLICIT none
@@ -53 +53 @@
       real cpdet
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
           cpdet = cpp*(t/t0_venus)**nu_venus
       else
@@ -75 +75 @@
 !======================================================================
 
-      USE control_mod, ONLY: planet_type 
+      USE control_mod, ONLY: cpofT 
       USE comconst_mod, ONLY: cpp,t0_venus,nu_venus
 
@@ -107 +107 @@
 !----------------------
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
           yteta = yt**nu_venus                                          &
      &            - nu_venus * t0_venus**nu_venus * log(ypk/cpp)
@@ -136 +136 @@
 !======================================================================
 
-      USE control_mod, ONLY: planet_type 
+      USE control_mod, ONLY: cpofT 
       USE comconst_mod, ONLY: cpp,nu_venus,t0_venus
 
@@ -168 +168 @@
 !----------------------
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
 
 !----------------------
@@ -193 +193 @@
       SUBROUTINE t2tpot_p(nlon,nlev, yt, yteta, ypk)
 ! Parallel version of t2tpot, for an arbitrary number of columns
-      USE control_mod, only : planet_type
+      USE control_mod, only : cpofT
       USE parallel_lmdz, only : OMP_CHUNK
       USE comconst_mod, ONLY: cpp,nu_venus,t0_venus
@@ -231 +231 @@
 !----------------------
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         do l=1,nlev
@@ -250 +250 @@
         enddo
 !$OMP END DO
-      endif ! of if (planet_type.eq."venus")
+      endif ! of if (cpofT)
 
       end subroutine t2tpot_p
@@ -261 +261 @@
 ! (more efficient than multiple calls to t2tpot_p() with slices of data)
       USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK
-      USE control_mod, only : planet_type
+      USE control_mod, only : cpofT
       USE comconst_mod, ONLY: cpp,nu_venus,t0_venus
 
@@ -306 +306 @@
       jje=jj_end
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         do l=1,llm
@@ -325 +325 @@
         enddo
 !$OMP END DO
-      endif ! of if (planet_type.eq."venus")
+      endif ! of if (cpofT)
 
       end subroutine t2tpot_glo_p
@@ -334 +334 @@
       SUBROUTINE tpot2t_p(nlon,nlev,yteta,yt,ypk)
 ! Parallel version of tpot2t, for an arbitrary number of columns
-      USE control_mod, only : planet_type
+      USE control_mod, only : cpofT
       USE parallel_lmdz, only : OMP_CHUNK
       USE comconst_mod, ONLY: cpp,nu_venus,t0_venus
@@ -373 +373 @@
 !----------------------
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         do l=1,nlev
@@ -391 +391 @@
         enddo
 !$OMP END DO
-      endif ! of if (planet_type.eq."venus")
+      endif ! of if (cpofT)
       end subroutine tpot2t_p
 
@@ -401 +401 @@
 ! (more efficient than multiple calls to tpot2t_p() with slices of data)
       USE parallel_lmdz, only : jj_begin,jj_end,OMP_CHUNK
-      USE control_mod, only : planet_type
+      USE control_mod, only : cpofT
       USE comconst_mod, ONLY: cpp,nu_venus,t0_venus
 
@@ -446 +446 @@
       jje=jj_end
 
-      if (planet_type.eq."venus") then
+      if (cpofT) then
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         do l=1,llm
@@ -465 +465 @@
         enddo
 !$OMP END DO
-      endif ! of if (planet_type.eq."venus")
+      endif ! of if (cpofT)
       end subroutine tpot2t_glo_p