Changeset 2195

Timestamp:

Dec 13, 2019, 11:41:41 AM (5 years ago)

Author:

slebonnois

Message:

SL: correction probleme sur le geopotentiel dans le cas Venus, ie Cp(T)... surtout problematique pour la haute atmosphere

Location:

trunk/LMDZ.COMMON/libf

Files:

• dyn3d/leapfrog.F (modified) (3 diffs)
• dyn3dpar/leapfrog_p.F (modified) (1 diff)

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

@@ -537 +537 @@
 
 ! Compute geopotential (physics might need it)
-         CALL geopot  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
+! GEOP CORRECTION
+! ADAPTATION GCM POUR CP(T)
+!        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 +                        &
@@ -825 +830 @@
                
 !              ! Ehouarn: re-compute geopotential for outputs
-               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+! GEOP CORRECTION
+! ADAPTATION GCM POUR CP(T)
+!              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
@@ -979 +989 @@
 
 !              ! Ehouarn: re-compute geopotential for outputs
-               CALL geopot(ip1jmp1,teta,pk,pks,phis,phi)
+! GEOP CORRECTION
+! ADAPTATION GCM POUR CP(T)
+!              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 

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

@@ -884 +884 @@
 c$OMP BARRIER
 ! Compute geopotential (physics might need it)
-         CALL geopot_p  ( ip1jmp1, teta  , pk , pks,  phis  , phi   )
+!====
+! GEOP CORRECTION
+! ADAPTATION GCM POUR CP(T)
+         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
+c$OMP BARRIER
+!====
 
            jD_cur = jD_ref + day_ini - day_ref