Changeset 779 for LMDZ4/trunk

Timestamp:

Jun 7, 2007, 2:01:57 PM (18 years ago)

Author:

Laurent Fairhead

Message:

Encore un petit soucis lors du merge
LF

File:

• LMDZ4/trunk/libf/phylmd/phyetat0.F (modified) (2 diffs)

LMDZ4/trunk/libf/phylmd/phyetat0.F

@@ -36 +36 @@
       INTEGER radpas
       REAL rlat_p(klon), rlon_p(klon)
-      REAL rlat_p(klon2), rlon_p(klon2)
       REAL co2_ppm_etat0
       REAL solaire_etat0
@@ -160 +159 @@
       ENDIF
 #ifdef NC_DOUBLE
-      ierr = NF_GET_VAR_DOUBLE(nid, nvarid, tab_cntrl_omp)
-#else
-      ierr = NF_GET_VAR_REAL(nid, nvarid, tab_cntrl_omp)
+      ierr = NF_GET_VAR_DOUBLE(nid, nvarid, tab_cntrl)
+#else
+      ierr = NF_GET_VAR_REAL(nid, nvarid, tab_cntrl)
 #endif
       IF (ierr.NE.NF_NOERR) THEN