Changeset 2362 for LMDZ5/trunk/libf/dyn3d_common/infotrac.F90

Timestamp:

Sep 16, 2015, 2:50:44 PM (9 years ago)

Author:

acozic

Message:

several correction to use LMDZ coupled with INCA
1- add an "use" in gcm to define "klon_glo" variable
2- correct an error on a test in infotrac
3- add parents to inca's tracer in infotrac
4- change calendar name for "leap calendar" in wxios to fit with rev 2229 on gcm

File:

• LMDZ5/trunk/libf/dyn3d_common/infotrac.F90 (modified) (2 diffs)

LMDZ5/trunk/libf/dyn3d_common/infotrac.F90

@@ -196 +196 @@
           nqo=2
        ENDIF
-       IF (nqo /= 2 .OR. nqo /= 3 ) THEN
+       IF (nqo /= 2 .AND. nqo /= 3 ) THEN
           WRITE(lunout,*) trim(modname),': nqo=',nqo, ' is not allowded. Only 2 or 3 water phases allowed'
           CALL abort_gcm('infotrac_init','Bad number of water phases',1)
@@ -384 +384 @@
 #endif
        tnom_0(1)='H2Ov'
+       tnom_transp(1) = 'air'
        tnom_0(2)='H2Ol'
-       IF (nqo == 3) tnom_0(3)='H2Oi'     !! jyg
+       tnom_transp(2) = 'air'
+       IF (nqo == 3) then 
+          tnom_0(3)='H2Oi'     !! jyg
+          tnom_transp(3) = 'air'
+       endif
 
 !jyg<
        DO iq = nqo+1, nqtrue
           tnom_0(iq)=solsym(iq-nqo)
+          tnom_transp(iq) = 'air'
        END DO
 !!       DO iq =3,nqtrue