Changeset 1669 for LMDZ5/branches/testing/libf/phy1d

Timestamp:

Oct 16, 2012, 2:41:50 PM (12 years ago)

Author:

Laurent Fairhead

Message:

Version testing basée sur la r1668

http://lmdz.lmd.jussieu.fr/utilisateurs/distribution-du-modele/versions-intermediaires

---

Testing release based on r1668

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phy1d/lmdz1d.F (modified) (2 diffs)

LMDZ5/branches/testing/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: