Changeset 1702

Timestamp:

Apr 24, 2017, 11:39:08 AM (8 years ago)

Author:

slebonnois

Message:

SL: petit correctif sur makelmdz

Location:

trunk/LMDZ.COMMON

Files:

• libf/dyn3d/leapfrog.F (modified) (3 diffs)
• libf/dyn3d_common/geopot.F (modified) (1 diff)
• libf/dyn3dpar/leapfrog_p.F (modified) (1 diff)
• makelmdz (modified) (2 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/leapfrog.F

@@ -518 +518 @@
 
 ! Compute geopotential (physics might need it)
-         CALL geopot  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
+         call tpot2t(ijp1llm,teta,temp,pk)
+         tsurpk = cpp*temp/pk
+         CALL geopot  ( ip1jmp1, tsurpk, pk, pks, phis, phi )
 
            jD_cur = jD_ref + day_ini - day_ref +                        &
@@ -803 +805 @@
                
 !              ! Ehouarn: re-compute geopotential for outputs
-               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+               call tpot2t(ijp1llm,teta,temp,pk)
+               tsurpk = cpp*temp/pk
+               CALL geopot(ip1jmp1,tsurpk,pk,pks,phis,phi)
 
                IF (ok_dynzon) THEN
@@ -947 +951 @@
 
 !              ! Ehouarn: re-compute geopotential for outputs
-               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+! ADAPTATION GCM POUR CP(T)
+               call tpot2t(ijp1llm,teta,temp,pk)
+               tsurpk = cpp*temp/pk
+               CALL geopot(ip1jmp1,tsurpk,pk,pks,phis,phi)
 
                IF (ok_dynzon) THEN 

trunk/LMDZ.COMMON/libf/dyn3d_common/geopot.F

@@ -21 +21 @@
 c     .. ngrid,teta,pk,pks,phis sont des argum. d'entree pour le s-pg ..
 c              phi               est un  argum. de sortie pour le s-pg .
+c
+c  This computation (with teta = cp T / pk !) is identical to 
+c     delta phi = R/RMD T/p delta p         (r=R/RMD=cpp*kappa)
 c
 c=======================================================================

trunk/LMDZ.COMMON/libf/dyn3dpar/leapfrog_p.F

@@ -862 +862 @@
 c$OMP BARRIER
 ! Compute geopotential (physics might need it)
-         CALL geopot_p  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
+
+         call tpot2t_glo_p(teta,temp,pk)
+         ijb=ij_begin
+         ije=ij_end
+!$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
+         do l=1,llm
+           tsurpk(ijb:ije,l)=cpp*temp(ijb:ije,l)/pk(ijb:ije,l)
+         enddo
+!$OMP END DO
+c$OMP MASTER
+
+!        CALL geopot_p(ip1jmp1,teta,pk,pks,phis,phi)
+         CALL geopot_p( ip1jmp1, tsurpk, pk, pks, phis, phi )
+c$OMP END MASTER
 
            jD_cur = jD_ref + day_ini - day_ref

trunk/LMDZ.COMMON/makelmdz

@@ -494 +494 @@
    CPP_KEY="$CPP_KEY CPP_IOIPSL"
    INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
 elif [[ $io == mix ]]
 then
@@ -500 +500 @@
    CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
-   LIB="$LIB -L${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
+   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
 elif [[ $io == xios ]]
 then