Changeset 2198 for LMDZ5/trunk/libf

Timestamp:

Feb 9, 2015, 9:36:55 AM (10 years ago)

Author:

Ehouarn Millour

Message:

Bug fix for aquaplanets: definition of limit.nc file variable types (real/double) must match used nf_put_..._double/real netcdf functions.
EM

File:

• LMDZ5/trunk/libf/phylmd/phyaqua_mod.F90 (modified) (1 diff)

LMDZ5/trunk/libf/phylmd/phyaqua_mod.F90

@@ -538 +538 @@
       dims(2) = ntim
 
-      ! cc      ierr = NF_DEF_VAR (nid, "TEMPS", NF_DOUBLE, 1,ntim, id_tim)
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'TEMPS', nf_double, 1, ntim, id_tim)
+#else
       ierr = nf_def_var(nid, 'TEMPS', nf_float, 1, ntim, id_tim)
+#endif
       ierr = nf_put_att_text(nid, id_tim, 'title', 17, 'Jour dans l annee')
-      ! cc      ierr = NF_DEF_VAR (nid, "NAT", NF_DOUBLE, 2,dims, id_NAT)
+
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'NAT', nf_double, 2, dims, id_nat)
+#else
       ierr = nf_def_var(nid, 'NAT', nf_float, 2, dims, id_nat)
+#endif
       ierr = nf_put_att_text(nid, id_nat, 'title', 23, &
         'Nature du sol (0,1,2,3)')
-      ! cc      ierr = NF_DEF_VAR (nid, "SST", NF_DOUBLE, 2,dims, id_SST)
+
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'SST', nf_double, 2, dims, id_sst)
+#else
       ierr = nf_def_var(nid, 'SST', nf_float, 2, dims, id_sst)
+#endif
       ierr = nf_put_att_text(nid, id_sst, 'title', 35, &
         'Temperature superficielle de la mer')
-      ! cc      ierr = NF_DEF_VAR (nid, "BILS", NF_DOUBLE, 2,dims, id_BILS)
+
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'BILS', nf_double, 2, dims, id_bils)
+#else
       ierr = nf_def_var(nid, 'BILS', nf_float, 2, dims, id_bils)
+#endif
       ierr = nf_put_att_text(nid, id_bils, 'title', 32, &
         'Reference flux de chaleur au sol')
-      ! cc      ierr = NF_DEF_VAR (nid, "ALB", NF_DOUBLE, 2,dims, id_ALB)
+
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'ALB', nf_double, 2, dims, id_alb)
+#else
       ierr = nf_def_var(nid, 'ALB', nf_float, 2, dims, id_alb)
+#endif
       ierr = nf_put_att_text(nid, id_alb, 'title', 19, 'Albedo a la surface')
-      ! cc      ierr = NF_DEF_VAR (nid, "RUG", NF_DOUBLE, 2,dims, id_RUG)
+
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'RUG', nf_double, 2, dims, id_rug)
+#else
       ierr = nf_def_var(nid, 'RUG', nf_float, 2, dims, id_rug)
+#endif
       ierr = nf_put_att_text(nid, id_rug, 'title', 8, 'Rugosite')
 
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'FTER', nf_double, 2, dims, id_fter)
+#else
       ierr = nf_def_var(nid, 'FTER', nf_float, 2, dims, id_fter)
-      ierr = nf_put_att_text(nid, id_fter, 'title', 8, 'Frac. Terre')
+#endif
+      ierr = nf_put_att_text(nid, id_fter, 'title',10,'Frac. Land')
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'FOCE', nf_double, 2, dims, id_foce)
+#else
       ierr = nf_def_var(nid, 'FOCE', nf_float, 2, dims, id_foce)
-      ierr = nf_put_att_text(nid, id_foce, 'title', 8, 'Frac. Terre')
+#endif
+      ierr = nf_put_att_text(nid, id_foce, 'title',11,'Frac. Ocean')
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'FSIC', nf_double, 2, dims, id_fsic)
+#else
       ierr = nf_def_var(nid, 'FSIC', nf_float, 2, dims, id_fsic)
-      ierr = nf_put_att_text(nid, id_fsic, 'title', 8, 'Frac. Terre')
+#endif
+      ierr = nf_put_att_text(nid, id_fsic, 'title',13,'Frac. Sea Ice')
+#ifdef NC_DOUBLE
+      ierr = nf_def_var(nid, 'FLIC', nf_double, 2, dims, id_flic)
+#else
       ierr = nf_def_var(nid, 'FLIC', nf_float, 2, dims, id_flic)
-      ierr = nf_put_att_text(nid, id_flic, 'title', 8, 'Frac. Terre')
+#endif
+      ierr = nf_put_att_text(nid, id_flic, 'title',14,'Frac. Land Ice')
 
       ierr = nf_enddef(nid)