Changeset 2408 for LMDZ5/branches/testing/libf/phymar/physiq.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phymar/physiq.F90 (modified) (8 diffs)

LMDZ5/branches/testing/libf/phymar/physiq.F90

@@ -11 +11 @@
      &            debut,lafin,jD_cur, jH_cur,pdtphys, &
      &            paprs,pplay,pphi,pphis,ppresnivs, &
-     &            u,v,t,qx, &
+     &            u,v,rot,t,qx, &
      &            flxmass_w, &
      &            d_u, d_v, d_t, d_qx, d_ps &
@@ -17 +17 @@
 
       USE dimphy, only : klon,klev,klevp1
-      USE infotrac, only : nqtot
-      USE comgeomphy, only : rlatd,rlond,airephy
+      USE infotrac_phy, only : nqtot
+      USE geometry_mod, only : latitude,longitude,cell_area
       !USE comcstphy, only : rg
       USE iophy, only : histbeg_phy,histwrite_phy
@@ -120 +120 @@
       real,intent(in) :: u(klon,klev) ! eastward zonal wind (m/s)
       real,intent(in) :: v(klon,klev) ! northward meridional wind (m/s)
+      REAL, intent(in):: rot(klon, klev) ! relative vorticity,
+                                         ! in s-1, needed for frontal waves
       real,intent(in) :: t(klon,klev) ! temperature (K)
       real,intent(in) :: qx(klon,klev,nqtot) ! tracers (.../kg_air)
@@ -498 +500 @@
 
 DO i=1,klon
-  IF (rlond(i) .LT. 0) THEN
-    lonh_HOST(i)=rlond(i)*12./rpi+24. ! from radians to hours
+  IF (longitude(i) .LT. 0) THEN
+    lonh_HOST(i)=longitude(i)*12./rpi+24. ! from radians to hours
    ELSE
-    lonh_HOST(i)=rlond(i)*12./rpi ! from radians to hours
+    lonh_HOST(i)=longitude(i)*12./rpi ! from radians to hours
   ENDIF
 ENDDO
-latr_HOST(:)=rlatd(:) ! from radians to radians
+latr_HOST(:)=latitude(:) ! from radians to radians
 
 !PRINT*, 'lonh_HOST(:)=',lonh_HOST(:)
@@ -689 +691 @@
 PRINT*, 'Initialisation de la temperature de surface avec les SST aquaplanète'
           DO i = 1,klon
-            Ts___HOST(i)=273.+27.*(1-sin(1.5*rlatd(i))**2)
-            IF ((rlatd(i).GT.1.0471975).OR.(rlatd(i).LT.-1.0471975)) THEN
+            Ts___HOST(i)=273.+27.*(1-sin(1.5*latitude(i))**2)
+            IF ((latitude(i).GT.1.0471975).OR.(latitude(i).LT.-1.0471975)) THEN
               Ts___HOST(i)=273.
             ENDIF
@@ -791 +793 @@
 DO k = 1, klev
   i=klev+1-k
-  !omega(i,k) = RG*flxmass_w(i,k) / airephy(i) ! omega en Pa/s
-  Wa___HOST(:,i)=flxmass_w(:,k) / airephy(:) * (gZam_HOST(:,i+1) - gZam_HOST(:,i))/(paprs(:,k+1)-paprs(:,k)) ! Equilibre hydrostatique
+  !omega(i,k) = RG*flxmass_w(i,k) / cell_area(i) ! omega en Pa/s
+  Wa___HOST(:,i)=flxmass_w(:,k) / cell_area(:) * (gZam_HOST(:,i+1) - gZam_HOST(:,i))/(paprs(:,k+1)-paprs(:,k)) ! Equilibre hydrostatique
 END DO
 Wa___HOST(:,klev)=0 ! Vitesse nulle à la surface.
@@ -853 +855 @@
 !IF (debut) THEN
   DO i=1,klon
-    sst__HOST(i)=273.+27.*(1-sin(1.5*rlatd(i))**2)
-    IF ((rlatd(i).GT.1.0471975).OR.(rlatd(i).LT.-1.0471975)) THEN
+    sst__HOST(i)=273.+27.*(1-sin(1.5*latitude(i))**2)
+    IF ((latitude(i).GT.1.0471975).OR.(latitude(i).LT.-1.0471975)) THEN
       sst__HOST(i)=273.
     ENDIF
@@ -908 +910 @@
       ikl0 = i
       PRINT*,'Attention : NaN at'
-      PRINT*,'longitude=',rlond(i)*180/rpi
-      PRINT*,'latitude=',rlatd(i)*180/rpi
+      PRINT*,'longitude=',longitude(i)*180/rpi
+      PRINT*,'latitude=',latitude(i)*180/rpi
     ENDIF
   ENDDO