Changeset 2009

Timestamp:

Apr 8, 2014, 10:48:17 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Rajout de la clé CPP_RRTM pour la compilation avec RRTM

---

Added CPP_RRTM key for RRTM compilation

Location:

LMDZ5/trunk/libf/phylmd

Files:

• physiq.F90 (modified) (5 diffs)
• radlwsw_aero.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/phylmd/physiq.F90

@@ -53 +53 @@
   USE phytrac_mod, ONLY : phytrac
 
+#ifdef CPP_RRTM
   USE YOERAD   , ONLY : NRADLP
+#endif
 
   !IM stations CFMIP
@@ -2713 +2715 @@
            ELSE                       ! RRTM radiation
 !
+#ifdef CPP_RRTM
              CALL readaerosol_optic_rrtm( &
              debut, new_aod, flag_aerosol, itap, jD_cur-jD_ref, &
@@ -2719 +2722 @@
              tau_aero_rrtm, piz_aero_rrtm, cg_aero_rrtm,  &
              tausum_aero, tau3d_aero)
+#else
+
+            abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
+            call abort_gcm(modname,abort_message,1)
+#endif
 !
            ENDIF
@@ -2742 +2750 @@
          CALL readaerosolstrato(debut)
         ELSE
+#ifdef CPP_RRTM
          CALL readaerosolstrato_rrtm(debut)
+#else
+
+         abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
+         call abort_gcm(modname,abort_message,1)
+#endif
         ENDIF
      ENDIF
@@ -2962 +2976 @@
 
   if (ok_newmicro) then
-     IF (iflag_rrtm.NE.0.AND.ok_cdnc.AND.NRADLP.NE.3) THEN 
-      PRINT *,'RRTM choix incoherent NRADLP doit etre egal a 3 pour ok_cdnc' 
-      STOP
+     IF (iflag_rrtm.NE.0) THEN 
+#ifdef CPP_RRTM
+       IF (ok_cdnc.AND.NRADLP.NE.3) THEN
+         abort_message='RRTM choix incoherent NRADLP doit etre egal a 3 pour ok_cdnc' 
+         call abort_gcm(modname,abort_message,1)
+       endif
+#else
+
+       abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
+       call abort_gcm(modname,abort_message,1)
+#endif
      ENDIF
      CALL newmicro (ok_cdnc, bl95_b0, bl95_b1, &

LMDZ5/trunk/libf/phylmd/radlwsw_aero.F90

@@ -33 +33 @@
 ! USE YOERAD   , ONLY : NSW      ,LRRTM    ,LCCNL    ,LCCNO ,&
 ! NSW mis dans .def MPL 20140211
-  USE YOERAD   , ONLY : LRRTM    ,LCCNL    ,LCCNO ,&
-      NRADIP   , NRADLP , NICEOPT, NLIQOPT ,RCCNLND  , RCCNSEA
-  USE YOELW    , ONLY : NSIL     ,NTRA     ,NUA      ,TSTAND   ,XP
-  USE YOESW    , ONLY : RYFWCA   ,RYFWCB   ,RYFWCC   ,RYFWCD,&   
-      RYFWCE   ,RYFWCF   ,REBCUA   ,REBCUB   ,REBCUC,&   
-      REBCUD   ,REBCUE   ,REBCUF   ,REBCUI   ,REBCUJ,&  
-      REBCUG   ,REBCUH   ,RHSAVI   ,RFULIO   ,RFLAA0,&  
-      RFLAA1   ,RFLBB0   ,RFLBB1   ,RFLBB2   ,RFLBB3,&  
-      RFLCC0   ,RFLCC1   ,RFLCC2   ,RFLCC3   ,RFLDD0,&  
-      RFLDD1   ,RFLDD2   ,RFLDD3   ,RFUETA   ,RASWCA,& 
-      RASWCB   ,RASWCC   ,RASWCD   ,RASWCE   ,RASWCF
+#ifdef CPP_RRTM
+!  USE YOERAD   , ONLY : LRRTM    ,LCCNL    ,LCCNO ,&
+!      NRADIP   , NRADLP , NICEOPT, NLIQOPT ,RCCNLND  , RCCNSEA
+!  USE YOELW    , ONLY : NSIL     ,NTRA     ,NUA      ,TSTAND   ,XP
+!  USE YOESW    , ONLY : RYFWCA   ,RYFWCB   ,RYFWCC   ,RYFWCD,&   
+!      RYFWCE   ,RYFWCF   ,REBCUA   ,REBCUB   ,REBCUC,&   
+!      REBCUD   ,REBCUE   ,REBCUF   ,REBCUI   ,REBCUJ,&  
+!      REBCUG   ,REBCUH   ,RHSAVI   ,RFULIO   ,RFLAA0,&  
+!      RFLAA1   ,RFLBB0   ,RFLBB1   ,RFLBB2   ,RFLBB3,&  
+!      RFLCC0   ,RFLCC1   ,RFLCC2   ,RFLCC3   ,RFLDD0,&  
+!      RFLDD1   ,RFLDD2   ,RFLDD3   ,RFUETA   ,RASWCA,& 
+!      RASWCB   ,RASWCC   ,RASWCD   ,RASWCE   ,RASWCF
 !&    RASWCB   ,RASWCC   ,RASWCD   ,RASWCE   ,RASWCF, RLINLI
-  USE YOERDU   , ONLY : NUAER  ,NTRAER ,REPLOG ,REPSC  ,REPSCW ,DIFF
-  USE YOETHF   , ONLY : RTICE
-  USE YOERRTWN , ONLY : DELWAVE   ,TOTPLNK      
+!  USE YOERDU   , ONLY : NUAER  ,NTRAER ,REPLOG ,REPSC  ,REPSCW ,DIFF
+!  USE YOETHF   , ONLY : RTICE
+!  USE YOERRTWN , ONLY : DELWAVE   ,TOTPLNK      
   USE YOMPHY3  , ONLY : RII0
+#endif
       
   IMPLICIT NONE
@@ -274 +276 @@
   REAL*8 zsolsw_aero(kdlon,9), zsolsw0_aero(kdlon,9)
 
+  CHARACTER (LEN=20) :: modname
+  CHARACTER (LEN=80) :: abort_message
+
   ! initialisation
   ist=1
@@ -524 +529 @@
 
       else
+#ifdef CPP_RRTM
       DO k = 1, kflev+1
       DO i = 1, kdlon
@@ -766 +772 @@
          ENDDO
       ENDDO
+#else
+
+            abort_message='You should compile with -rrtm if running with iflag_rrtm=1'
+            call abort_gcm(modname,abort_message,1)
+#endif
       ENDIF   ! if(iflag_rrtm=0)
          print*,'OK3'