Changeset 2362 for LMDZ5/trunk

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

Location:

LMDZ5/trunk/libf

Files:

• dyn3d_common/infotrac.F90 (modified) (2 diffs)
• dyn3dmem/gcm.F90 (modified) (1 diff)
• misc/wxios.F90 (modified) (1 diff)

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

LMDZ5/trunk/libf/dyn3dmem/gcm.F90

@@ -22 +22 @@
   USE indice_sol_mod
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
+  USE mod_grid_phy_lmdz, ONLY : klon_glo
 #endif
 

LMDZ5/trunk/libf/misc/wxios.F90

@@ -191 +191 @@
                 CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "NoLeap")
                 IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier terrestre a 365 jours/an'
-            CASE('earth_366d')
+            CASE('gregorian')
                 CALL xios_set_context_attr_hdl(g_ctx, calendar_type= "Gregorian")
                 IF (prt_level >= 10) WRITE(lunout,*) 'wxios_set_cal: Calendrier gregorien'