Changeset 622 for trunk/LMDZ.GENERIC/libf/phystd/inifis.F

Timestamp:

Apr 16, 2012, 12:22:40 PM (13 years ago)

Author:

jleconte

Message:

• Added consistency checks for calculations including water and global1d+diurnal.
• Corrected small bugs in precipitation scheme

File:

• trunk/LMDZ.GENERIC/libf/phystd/inifis.F (modified) (4 diffs)

trunk/LMDZ.GENERIC/libf/phystd/inifis.F

@@ -438 +438 @@
          endif
 
-! Test of incompatibility:
-
          write(*,*) "Gravitationnal sedimentation ?"
          sedimentation=.true. ! default value
          call getin("sedimentation",sedimentation)
          write(*,*) " sedimentation = ",sedimentation
-
-
-! Test of incompatibility:
 
          write(*,*) "Compute water cycle ?"
@@ -453 +448 @@
          write(*,*) " water = ",water
          
+! Test of incompatibility:
+! if water is true, there should be at least a tracer
+         if (water.and.(.not.tracer)) then
+           print*,'if water is ON, tracer must be ON too!'
+           stop
+         endif
+
          write(*,*) "Include water condensation ?"
          watercond=.false. ! default value
@@ -458 +460 @@
          write(*,*) " watercond = ",watercond
 
+! Test of incompatibility:
+! if watercond is used, then water should be used too
+         if (watercond.and.(.not.water)) then
+           print*,'if watercond is used, water should be used too'
+           stop
+         endif
+
          write(*,*) "Include water precipitation ?"
          waterrain=.false. ! default value
@@ -497 +506 @@
          call getin("Tsaldiff",Tsaldiff)
          write(*,*) " Tsaldiff = ",Tsaldiff
-
-! Test of incompatibility:
-! if watercond is used, then water should be used too
-
-         if (watercond.and.(.not.watercond)) then
-           print*,'if watercond is used, water should be used too'
-           stop
-         endif
 
          write(*,*) "Does user want to force cpp and mugaz?"