Changeset 677 for LMDZ4/trunk/libf/dyn3d

Timestamp:

Jan 27, 2006, 4:14:22 PM (19 years ago)

Author:

Laurent Fairhead

Message:

Differentes corrections pour g95
LF

Location:

LMDZ4/trunk/libf/dyn3d

Files:

• conf_dat2d.F (modified) (1 diff)
• limit_netcdf.F (modified) (2 diffs)
• startvar.F (modified) (3 diffs)

LMDZ4/trunk/libf/dyn3d/conf_dat2d.F

@@ -215 +215 @@
        ENDDO
 
+      deallocate(xtemp)
+      deallocate(ytemp)
+
       RETURN
       END

LMDZ4/trunk/libf/dyn3d/limit_netcdf.F

@@ -452 +452 @@
 
       ierr = NF_OPEN('amipbc_sic_1x1.nc', NF_NOWRITE, ncid)
-      if (ierr.ne.0) then
-        print *, NF_STRERROR(ierr)
-        STOP
+      if (ierr.ne.0) THEN
+        ierr = NF_OPEN('amipbc_sic_1x1_clim.nc', NF_NOWRITE, ncid)
+        if (ierr.ne.0) THEN
+          print *, NF_STRERROR(ierr)
+          STOP
+        endif
       ENDIF
 
@@ -775 +778 @@
 c     ierr = NF_OPEN('AMIP_SST.nc', NF_NOWRITE, ncid)
       ierr = NF_OPEN('amipbc_sst_1x1.nc', NF_NOWRITE, ncid)
-      if (ierr.ne.0) then
-        print *, NF_STRERROR(ierr)
-        STOP
+      if (ierr.ne.0) THEN
+        ierr = NF_OPEN('amipbc_sst_1x1_clim.nc', NF_NOWRITE, ncid)
+        if (ierr.ne.0) THEN
+          print *, NF_STRERROR(ierr)
+          STOP
+        endif
       ENDIF
 

LMDZ4/trunk/libf/dyn3d/startvar.F

@@ -1054 +1054 @@
       REAL, ALLOCATABLE :: var_tmp2d(:,:), var_tmp3d(:,:,:)
       REAL, ALLOCATABLE :: ax(:), ay(:), yder(:)
-       REAL, ALLOCATABLE :: varrr(:,:,:)
+!       REAL, ALLOCATABLE :: varrr(:,:,:)
       INTEGER, ALLOCATABLE :: lind(:)
     !
@@ -1062 +1062 @@
           ALLOCATE(var_ana3d(iml_dyn, jml_dyn, llm_dyn))
       ENDIF
-          ALLOCATE(varrr(iml_dyn, jml_dyn, llm_dyn))
+!          ALLOCATE(varrr(iml_dyn, jml_dyn, llm_dyn))
     !
     !
@@ -1173 +1173 @@
 
       DEALLOCATE(lon_rad)
+      DEALLOCATE(lon_ini)
       DEALLOCATE(lat_rad)
+      DEALLOCATE(lat_ini)
+      DEALLOCATE(lev_dyn)
       DEALLOCATE(var_tmp2d)
       DEALLOCATE(var_tmp3d)