Changeset 102 for trunk/libf/phytitan/printflag.F

Timestamp:

Mar 24, 2011, 11:46:27 AM (14 years ago)

Author:

slebonnois

Message:

SL : corrections et modifications dans phytitan correspondant a celles
faites apres compilation Venus. Titan pas encore compile.

File:

• trunk/libf/phytitan/printflag.F (modified) (8 diffs)

trunk/libf/phytitan/printflag.F

@@ -12 +12 @@
 
        REAL tabcntr0( 100 )
-       LOGICAL cycle_diurn0,soil_model0,new_oliq0,ok_orodr0
-       LOGICAL ok_orolf0,ok_limitvr0
+       LOGICAL cycle_diurn0,soil_model0,ok_orodr0
+       LOGICAL ok_orolf0,ok_gw_nonoro0
        LOGICAL ok_mensuel, ok_journe, ok_instan
        INTEGER radpas , radpas0
@@ -33 +33 @@
        PRINT 100
 
-c      PRINT 11, new_oliq, ok_orodr, ok_orolf   
-c      PRINT 100
+       PRINT 11, ok_orodr, ok_orolf, ok_gw_nonoro   
+       PRINT 100
 
        PRINT 12, nbapp_rad
@@ -55 +55 @@
         cycle_diurn0  = .FALSE.
         soil_model0   = .FALSE.
-        new_oliq0     = .FALSE.
         ok_orodr0     = .FALSE.
         ok_orolf0     = .FALSE.
-        ok_limitvr0   = .FALSE.
+        ok_gw_nonoro0 = .FALSE.
 
         IF( tabcntr0( 7 ).EQ. 1. )   cycle_diurn0 = .TRUE.
         IF( tabcntr0( 8 ).EQ. 1. )    soil_model0 = .TRUE.
-        IF( tabcntr0( 9 ).EQ. 1. )      new_oliq0 = .TRUE.
         IF( tabcntr0(10 ).EQ. 1. )      ok_orodr0 = .TRUE.
         IF( tabcntr0(11 ).EQ. 1. )      ok_orolf0 = .TRUE.
-        IF( tabcntr0(12 ).EQ. 1. )    ok_limitvr0 = .TRUE.
+        IF( tabcntr0(12 ).EQ. 1. )  ok_gw_nonoro0 = .TRUE.
 
         PRINT *,' $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
@@ -108 +106 @@
        ENDIF
 
-       IF( new_oliq0.AND..NOT.new_oliq.OR..NOT.new_oliq0.AND.
-     ,        new_oliq )     THEN
-        PRINT 16, new_oliq0, new_oliq
-        PRINT 100
-       ENDIF
-
        IF( ok_orodr0.AND..NOT.ok_orodr.OR..NOT.ok_orodr0.AND.
      ,        ok_orodr )     THEN
@@ -126 +118 @@
        ENDIF
 
-       IF( ok_limitvr0.AND..NOT.ok_limitvrai.OR..NOT.ok_limitvr0.
-     ,     AND.ok_limitvrai )     THEN
-        PRINT 18, ok_limitvr0, ok_limitvrai
+       IF( ok_gw_nonoro0.AND..NOT.ok_gw_nonoro.OR..NOT.ok_gw_nonoro0.
+     ,     AND.ok_gw_nonoro )     THEN
+        PRINT 18, ok_gw_nonoro0, ok_gw_nonoro
         PRINT 100
        ENDIF
@@ -140 +132 @@
      . , ok_instan = ',l3,8x,5(1H*) )
 
- 7     FORMAT(2x,5(1H*),15x,'      ok_limitvrai   = ',l3,16x,5(1h*) )
-
  8     FORMAT(2x,'*****             radpas    =                      ' ,
      , i4,6x,' *****')
@@ -149 +139 @@
 
 
- 11    FORMAT(2x,5(1H*),'  new_oliq = ',l3,3x,', Ok_orodr = ',
-     , l3,3x,', Ok_orolf = ',l3,3x,5(1H*) )
+ 11    FORMAT(2x,5(1H*),', Ok_orodr = ',l3,3x,', Ok_orolf = ',l3,3x,
+     ,    ' ok_gw_nonoro = ',l3,3x,5(1H*) )
 
 
@@ -165 +155 @@
      , /1x,10x,' startphy = ',l3,2x,' et  run.def = ',l3)
 
- 16    FORMAT(2x,'$$$$$$$$   Attention !!      new_oliq  different  sur',
-     , /1x,10x,' startphy = ',l3,2x,' et  run.def = ',l3)
-
  17    FORMAT(2x,'$$$$$$$$   Attention !!      ok_orolf  different  sur',
      , /1x,10x,' startphy = ',l3,2x,' et  run.def = ',l3)
 
- 18    FORMAT(2x,'$$$$$$$$   Attention !!  ok_limitvrai  different  sur',
+ 18    FORMAT(2x,'$$$$$$$$   Attention !!  ok_gw_nonoro  different  sur',
      , /1x,10x,' startphy = ',l3,2x,' et  run.def = ',l3)