Changeset 2967 for LMDZ5/branches/IPSLCM6.0.11/libf

Timestamp:

Jul 25, 2017, 3:24:40 PM (7 years ago)

Author:

acozic

Message:

merge with revision 2966 of the trunk to allow inca to run without crash with this version of lmdz

Location:

LMDZ5/branches/IPSLCM6.0.11

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_write_mod.F90 (modified) (2 diffs)

LMDZ5/branches/IPSLCM6.0.11/libf/phylmd/phys_output_write_mod.F90

@@ -343 +343 @@
     USE YOESW, ONLY : RSUN
 #endif
+    USE tracinca_mod, ONLY: config_inca
 
     IMPLICIT NONE
@@ -1247 +1248 @@
           CALL histwrite_phy(o_solswad, solswad_aero*swradcorr)
           CALL histwrite_phy(o_solswad0, solswad0_aero*swradcorr)
-          CALL histwrite_phy(o_toplwad, toplwad_aero)
-          CALL histwrite_phy(o_toplwad0, toplwad0_aero)
-          CALL histwrite_phy(o_sollwad, sollwad_aero)
-          CALL histwrite_phy(o_sollwad0, sollwad0_aero)
+          IF (type_trac .ne. 'inca') THEN 
+             IF (config_inca .ne. 'aeNP') THEN 
+                CALL histwrite_phy(o_toplwad, toplwad_aero)
+                CALL histwrite_phy(o_toplwad0, toplwad0_aero)
+                CALL histwrite_phy(o_sollwad, sollwad_aero)
+                CALL histwrite_phy(o_sollwad0, sollwad0_aero)
+             ENDIF
+          ENDIF
           !====MS forcing diagnostics
           IF (new_aod) THEN