Changeset 1999 for LMDZ5/branches/testing/libf/dyn3dpar/logic.h

Timestamp:

Mar 20, 2014, 10:57:19 AM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1920:1997 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dpar/logic.h (modified) (2 diffs)

LMDZ5/branches/testing/libf/dyn3dpar/logic.h

@@ -11 +11 @@
      &  statcl,conser,apdiss,apdelq,saison,ecripar,fxyhypb,ysinus       &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf,hybrid
+     &  ,ok_limit,ok_etat0,hybrid
 
       COMMON/logici/ iflag_phys,iflag_trac
@@ -18 +18 @@
      & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus                      &
      &  ,read_start,ok_guide,ok_strato,ok_gradsfile                     &
-     &  ,ok_limit,ok_etat0,grilles_gcm_netcdf
+     &  ,ok_limit,ok_etat0
+
       logical hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
                      ! (only used if disvert_type==2)