Changeset 1664

Timestamp:

Feb 14, 2017, 1:56:39 PM (8 years ago)

Author:

slebonnois

Message:

SL: update of the cloud model after first debug

Location:

trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus

Files:

• donnees.F90 (modified) (1 diff)
• mad_muphy.F90 (modified) (3 diffs)
• newbinapara.F90 (deleted)
• real_16.F90 (deleted)
• wsa_new.F90 (modified) (2 diffs)

trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/donnees.F90

@@ -1 +1 @@
 MODULE donnees
 
-  use real16
   implicit none
 
-  real, parameter :: ZERO = epsilon(1.0_real_16) != 2.220446049250313E-016
+  real, parameter :: ZERO = 2.220446049250313E-016
   real, parameter :: PI = 3.1415926536D0
   real, save :: E          ! Constant for microphys. processes

trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/mad_muphy.F90

@@ -440 +440 @@
         CALL MERGING(r2,N2,sigma2,sigma1,dM0_merge_m2,dM3_merge_m2, &
              &   dM0_merge_m1,dM3_merge_m1)
-        ! mode 1
+        ! mode 2
         M0_m2(1) = dM0_merge_m2
         M0_m2(2) = dM0_merge_m2*frac_ccn_m2
@@ -446 +446 @@
         M3_m2(2) = dM3_merge_m2*(1.D0-frac_ccn_m2)*(1.D0-WSA)
         M3_m2(3) = dM3_merge_m2*frac_ccn_m2
-        ! mode 2
+        ! mode 1
         M0_m1(1) = M0_m1(1) + dM0_merge_m1
         M0_m1(2) = M0_m1(2) + dM0_merge_m1*(frac_ccn_m2+frac_ccn_m1)
@@ -455 +455 @@
   ENDIF
 
+!-----------------------------------------------------------------------
+!                        UPDATE OF OUTPUT VALUES
+!----------------------------------------------------------------------- 
+
+        ! mode 1
+        M0_m1drop = M0_m1(1)
+        M0_m1ccn  = M0_m1(2)
+        M3_m1sa   = M3_m1(1)
+        M3_m1w    = M3_m1(2)
+        M3_m1ccn  = M3_m1(3)
+        ! mode 2
+        M0_m2drop = M0_m2(1)
+        M0_m2ccn  = M0_m2(2)
+        M3_m2sa   = M3_m2(1)
+        M3_m2w    = M3_m2(2)
+        M3_m2ccn  = M3_m2(3)
 
 !-----------------------------------------------------------------------

trunk/LMDZ.VENUS/libf/phyvenus/cloudvenus/wsa_new.F90

@@ -93 +93 @@
   REAL :: psatwv,watact
   INTEGER :: ITERAT 
-  write(*,*)'WSA ROSA NEW', RADIUS
+!  write(*,*)'WSA ROSA NEW', RADIUS
   MH2O=MWV
 
@@ -263 +263 @@
 
   INTEGER, INTENT(OUT) :: FLAGWV
-  write(*,*)'BRACWV', RADIUS
+!  write(*,*)'BRACWV', RADIUS
   ! WVEQACC est le seuil auquel on accorde un WSA correct meme
   ! si il ne fait pas partie d'une borne. Utile quand le modele