Changeset 1060 for LMDZ4/trunk

Timestamp:

Dec 16, 2008, 7:08:30 PM (16 years ago)

Author:

Laurent Fairhead

Message:

Correction bug cas physique Newtonnienne (iflag_phys=2) pour ne plus
passer par la physique
EM/FH/IM

File:

• LMDZ4/trunk/libf/dyn3d/leapfrog.F (modified) (3 diffs)

LMDZ4/trunk/libf/dyn3d/leapfrog.F

@@ -1 @@
-!
-! $Header$
 !
 c
@@ -271 +269 @@
          IF( MOD(itau,idissip ).EQ.0.AND..NOT.forward ) apdiss = .TRUE.
          IF( MOD(itau,iphysiq ).EQ.0.AND..NOT.forward 
-     s          .and. iflag_phys.NE.0                 ) apphys = .TRUE.
+     s          .and. iflag_phys.EQ.1                 ) apphys = .TRUE.
       ELSE
          IF( MOD(itau   ,iconser) .EQ. 0              ) conser = .TRUE.
          IF( MOD(itau+1,idissip)  .EQ. 0              ) apdiss = .TRUE.
-         IF( MOD(itau+1,iphysiq).EQ.0.AND.iflag_phys.NE.0) apphys=.TRUE.
+         IF( MOD(itau+1,iphysiq).EQ.0.AND.iflag_phys.EQ.1) apphys=.TRUE.
       END IF
 
@@ -396 +394 @@
      e  , ucov    , vcov , ps, p ,pk , teta , q(:,:,1), q(:,:,2))
       ENDIF 
-#else
-
-c   Calcul academique de la physique = Rappel Newtonien + fritcion 
+#endif
+       ENDIF ! of IF( apphys )
+
+      IF(iflag_phys.EQ.2) THEN ! "Newtonian physics" case
+c   Calcul academique de la physique = Rappel Newtonien + friction 
 c   --------------------------------------------------------------
        teta(:,:)=teta(:,:)
      s  -iphysiq*dtvr*(teta(:,:)-tetarappel(:,:))/taurappel
        call friction(ucov,vcov,iphysiq*dtvr)
-
-#endif
+      ENDIF
+
 
 c-jld
-       ENDIF
 
         CALL pression ( ip1jmp1, ap, bp, ps, p                  )