Changeset 1649 for LMDZ5/trunk/libf

Timestamp:

Aug 22, 2012, 5:32:25 PM (12 years ago)

Author:

Ehouarn Millour

Message:

Corrections pour que les cas a flux de surface imposes marchent.
MPL & JYG

Location:

LMDZ5/trunk/libf

Files:

• phy1d/lmdz1d.F (modified) (2 diffs)
• phylmd/wake.F (modified) (1 diff)

LMDZ5/trunk/libf/phy1d/lmdz1d.F

@@ -273 +273 @@
       elseif (forcing_type .eq.61) THEN
        forcing_armcu = .true.
+       IF(llm.NE.19.AND.llm.NE.40) stop 'Erreur nombre de niveaux !!'
       else
        write (*,*) 'ERROR : unknown forcing_type ', forcing_type
@@ -399 +400 @@
       rho(1)=psurf/(rd*tsurf*(1.+(rv/rd-1.)*qsurf)) 
 
-      ok_flux_surf=.false.
-      fsens=-wtsurf*rcpd*rho(1)
-      flat=-wqsurf*rlvtt*rho(1)
+!
+!! mpl et jyg le 22/08/2012 : 
+!!  pour que les cas a flux de surface imposes marchent
+      IF(.NOT.ok_flux_surf) THEN
+       fsens=-wtsurf*rcpd*rho(1)
+       flat=-wqsurf*rlvtt*rho(1)
+       print *,'Flux: ok_flux wtsurf wqsurf',ok_flux_surf,wtsurf,wqsurf
+      ENDIF
+!!      ok_flux_surf=.false.
+!!      fsens=-wtsurf*rcpd*rho(1)
+!!      flat=-wqsurf*rlvtt*rho(1)
+!!!!
 
 ! Vertical discretization and pressure levels at half and mid levels:

LMDZ5/trunk/libf/phylmd/wake.F

@@ -561 +561 @@
       ENDDO
 
-c      On evite kupper = 1
+c      On evite kupper = 1 et kupper = klev
       DO i=1,klon
         kupper(i) = max(kupper(i),2)
+        kupper(i) = min(kupper(i),klev-1)
       ENDDO