Changeset 1307 for LMDZ4

Timestamp:

Jan 29, 2010, 3:40:49 PM (14 years ago)

Author:

Laurent Fairhead

Message:

Changes in output options for aerosols

---

Changements dans les options de sorties pour les aerosols

ACo

Location:

LMDZ4/trunk/libf/phylmd

Files:

• phys_output_mod.F90 (modified) (1 diff)
• sw_aeroAR4.F90 (modified) (6 diffs)

LMDZ4/trunk/libf/phylmd/phys_output_mod.F90

@@ -339 +339 @@
   type(ctrl_out),save :: o_rugs         = ctrl_out((/ 10, 10, 10, 1, 1 /),'rugs')
 
-  type(ctrl_out),save :: o_topswad      = ctrl_out((/ 4, 10, 10, 10, 10 /),'topswad')
-  type(ctrl_out),save :: o_topswai      = ctrl_out((/ 4, 10, 10, 10, 10 /),'topswai')
-  type(ctrl_out),save :: o_solswad      = ctrl_out((/ 4, 10, 10, 10, 10 /),'solswad')
-  type(ctrl_out),save :: o_solswai      = ctrl_out((/ 4, 10, 10, 10, 10 /),'solswai')
+  type(ctrl_out),save :: o_topswad      = ctrl_out((/ 2, 10, 10, 10, 10 /),'topswad')
+  type(ctrl_out),save :: o_topswai      = ctrl_out((/ 2, 10, 10, 10, 10 /),'topswai')
+  type(ctrl_out),save :: o_solswad      = ctrl_out((/ 2, 10, 10, 10, 10 /),'solswad')
+  type(ctrl_out),save :: o_solswai      = ctrl_out((/ 2, 10, 10, 10, 10 /),'solswai')
 
   type(ctrl_out),save,dimension(10) :: o_tausumaero  = (/ ctrl_out((/ 4, 10, 10, 10, 10 /),'OD550_ASBCM'), &

LMDZ4/trunk/libf/phylmd/sw_aeroAR4.F90

@@ -186 +186 @@
 !$OMP THREADPRIVATE(AEROSOLFEEDBACK_ACTIVE)  
 
+      CHARACTER (LEN=20) :: modname='sw_aeroAR4'
+      CHARACTER (LEN=80) :: abort_message
+
   IF ((.not. ok_ade) .and. (AEROSOLFEEDBACK_ACTIVE .ge. 2)) THEN
-     print*,'Error: direct effect is not activated but assumed to be active - see sw_aeroAR4.F90'
-     stop
+     abort_message ='Error: direct effect is not activated but assumed to be active - see sw_aeroAR4.F90'
+     CALL abort_gcm (modname,abort_message,1)
   ENDIF
   AEROSOLFEEDBACK_ACTIVE=MIN(MAX(AEROSOLFEEDBACK_ACTIVE,0),3)
   IF  (AEROSOLFEEDBACK_ACTIVE .gt. 3) THEN
-     print*,'Error: AEROSOLFEEDBACK_ACTIVE options go only until 3'
-     stop
+     abort_message ='Error: AEROSOLFEEDBACK_ACTIVE options go only until 3'
+     CALL abort_gcm (modname,abort_message,1)
   ENDIF
 
@@ -238 +241 @@
 
 ! clear sky is either computed IF no direct effect is asked for, or for extended diag) 
-     IF (( lev_histmth .eq. 4 ) .or. ( .not. ok_ade )) THEN    
+     IF (( lev_histmth .ge. 4 ) .or. ( .not. ok_ade )) THEN    
 
      ! clear-sky: zero aerosol effect
@@ -267 +270 @@
 
 ! cloudy sky is either computed IF no indirect effect is asked for, or for extended diag) 
-     IF (( lev_histmth .eq. 4 ) .or. ( .not. ok_aie )) THEN    
+     IF (( lev_histmth .ge. 4 ) .or. ( .not. ok_aie )) THEN    
      ! cloudy-sky: zero aerosol effect
      flag_aer=0.0
@@ -326 +329 @@
 
 ! cloudy sky is either computed IF no indirect effect is asked for, or for extended diag) 
-        IF (( lev_histmth .eq. 4 ) .or. (.not. ok_aie)) THEN  
+        IF (( lev_histmth .ge. 2 ) .or. (.not. ok_aie)) THEN  
         ! cloudy-sky aerosol direct effect of total aerosol
         flag_aer=1.0
@@ -355 +358 @@
 
 ! natural aeroosl clear sky is  computed  for extended diag) 
-        IF ( lev_histmth .eq. 4 ) THEN            
+        IF ( lev_histmth .ge. 4 ) THEN            
         ! clear sky direct effect natural aerosol
         flag_aer=1.0
@@ -384 +387 @@
 
 ! cloud sky natural is for extended diagnostics
-        IF ( lev_histmth .eq. 4 ) THEN
+        IF ( lev_histmth .ge. 2 ) THEN
         ! cloudy-sky direct effect natural aerosol
         flag_aer=1.0