Changeset 288 for trunk/LMDZ.MARS/libf

Timestamp:

Sep 9, 2011, 9:38:30 AM (13 years ago)

Author:

aslmd

Message:

LMDZ.MARS

09/09/11 == AS

--> Fixed a problem with .eq. used with booleans in physiq.F
[some good picky compilers complain about this]
--> Added a warning in inifis about using
callrichsl = .false.
calltherm = .true.
which is not recommended. The new surface layer has been built to go
with the new mixing layer scheme (thermals). And anyway it is a much
better scheme than the previous one.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• inifis.F (modified) (1 diff)
• physiq.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/phymars/inifis.F

@@ -257 +257 @@
          call getin("callrichsl",callrichsl)
          write(*,*) " callrichsl = ",callrichsl
+
+         if (calltherm .and. .not.callrichsl) then
+          print*,'WARNING WARNING WARNING'
+          print*,'if calltherm=T we strongly advise that '
+          print*,'you use the new surface layer scheme '
+          print*,'by setting callrichsl=T '
+         endif
 
          write(*,*) "call CO2 condensation ?"

trunk/LMDZ.MARS/libf/phymars/physiq.F

@@ -689 +689 @@
          enddo
 
+
+#ifdef MESOSCALE
+      IF (flag_LES .eq. .false.) THEN
+#endif
+c ----------------------
 c Treatment of a special case : using new surface layer (Richardson based)
 c without using the thermals in gcm and mesoscale can yield problems in
@@ -694 +699 @@
 c a unit subgrid gustiness. Remember that thermals should be used we using the 
 c Richardson based surface layer model.
-
-#ifdef MESOSCALE
-      IF (flag_LES .eq. .false.) THEN
-        IF ((calltherm .eq. .false.) .and. (callrichsl .eq. .true.)) THEN
+        IF ( .not.calltherm .and. callrichsl ) THEN
           DO ig=1, ngridmx
              IF (zh(ig,1) .lt. tsurf(ig)) THEN
@@ -704 +706 @@
           ENDDO
         ENDIF
+c ----------------------
+#ifdef MESOSCALE
       ENDIF
-#else
-      IF ((calltherm .eq. .false.) .and. (callrichsl .eq. .true.)) THEN
-        DO ig=1, ngridmx
-          IF (zh(ig,1) .lt. tsurf(ig)) THEN
-            wmax_th(ig)=1.
-          ENDIF
-        ENDDO
-      ENDIF    
 #endif
+
 
 c        Calling vdif (Martian version WITH CO2 condensation)