Changeset 2104

Timestamp:

Aug 4, 2014, 1:22:25 AM (10 years ago)

Author:

fhourdin

Message:

Corrections de phymar par Gilles Delaygue.

Location:

LMDZ5/trunk/libf/phymar

Files:

• PHY_MAR___.f90 (modified) (6 diffs)
• physiq.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/phymar/PHY_MAR___.f90

@@ -501 +501 @@
 !PRINT*,'minval(Ta__DY(:,mzpp))=',minval(Ta__DY(:,mzpp))
 ! Martin control
+
         DO ikl = 1,kcolp
            i                    = ii__AP   (ikl)
@@ -506 +507 @@
            psa_DY    (ikl     ) = psa__HOST(ikl)
            Ta__DY    (ikl,mzpp) = pkta_HOST(ikl,mzpp)*(psa_DY(ikl)+pt__DY)**RCp
+!gilles : init
+           Z___DY    (ikl,mzpp) = 0.
+           qv__DY    (ikl,mzpp) = 0.001
          DO k =   mzp,1,-1
            Z___DY    (ikl,k   ) =                                      &
@@ -624 +628 @@
 ! -------------------------
 
+!gilles: PHY_Atm_RT_INI requires correct dates
+          YearTU = Year_H
+          Mon_TU = Mon__H
+          Day_TU = Day__H
+          HourTU = Hour_H
+          minuTU = minu_H
+          sec_TU = sec__H
+
 !                            **************
                        CALL  PHY_Atm_RT_INI
 !                            **************
-
-
 
 ! -----------------------------------------------------------------------------!
@@ -704 +714 @@
           END IF
           IF (FlagAT  .AND.      mod(it_RUN-1,jt__AT).EQ.0)         THEN
-              dTimAT =              (TimeTU-TimeAT) * 3600.
+!gilles: leapfrog scheme stops time integration regularly
+!              dTimAT =              (TimeTU-TimeAT) * 3600.
+              dTimAT =    dt0_AT
               TimeAT =               TimeTU
           END IF
@@ -822 +834 @@
           ENDDO
 
-
-
 ! -----------------------------------------------------------------------------!
 ! Assignation    of  Mod_PHY_DY_kkl
@@ -855 +865 @@
 ! Saturation Specific Humidity
 ! ----------------------------
+
           IF (FlagCM .OR. &! ***************
      &        FlagSV)  CALL  PHY_Atm_CM_QSat

LMDZ5/trunk/libf/phymar/physiq.F90

@@ -33 +33 @@
       use Mod_PHY_S0_grd
       use Mod_SISVAT_grd
+      use Mod_SISVAT_dat
       use Mod_SISVAT_gpt ! surface heat flxes in outputs
       use Mod_PHY_DY_kkl
@@ -629 +630 @@
           mwp    = mwq
 
+! Initialization of Mod_SISVAT_dat
+! --------------------------------
+! pour aquaplanete: FixedSST=1
+          VarSST = 0.
+
 ! Initialization of Physical Constants and Allocation of main Variables
 ! ---------------------------------------------------------------------
@@ -749 +755 @@
 
 IF (debut) THEN
-!GD  ! On initialise avec la temperature du premier niveau au lieu de la temperature de surface à la première itération:
-!GD  pkt_DY_surf_tmp(:)=t(:,1) / (pplay(:,1)/1000) ** kap
-  ! init sur Ts___HOST
-     pkt_DY_surf_tmp(:)=Ts___HOST(:)
+! On initialise avec la temperature du premier niveau au lieu de la temperature de surface à la première itération:
+   pkt_DY_surf_tmp(:)=t(:,1) / (pplay(:,1)/1000) ** kap
    ELSE
-   pkt_DY_surf_tmp(i)=pkt_DY(i,klev+1)
+   pkt_DY_surf_tmp(:)=pkt_DY(:,klev+1)
 ENDIF
+
 pkta_HOST(:,klev+1)=pkt_DY_surf_tmp(:)
 DO k = 1, klev