Changeset 697 for trunk/LMDZ.MARS/libf/phymars/surfini.F

Timestamp:

Jun 6, 2012, 10:56:42 AM (12 years ago)

Author:

emillour

Message:

Mars GCM:

• Minor cleanup in surfini.F
• Corrected the polar mesh surface area which was wrong in the physics (changes in phyetat0.F, calfis.F and newstart.F)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/surfini.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/surfini.F

@@ -2 +2 @@
    ! to use  'getin'
       USE ioipsl_getincom
+      use netcdf
       IMPLICIT NONE
 c=======================================================================
@@ -20 +21 @@
 
 #include "datafile.h"
-#include "netcdf.inc"
 
       INTEGER ngrid,ig,icap,iq,alternate
@@ -57 +57 @@
       
       REAL,SAVE :: min_icevalue = 500.
-      PARAMETER string = 'thermal'
+      character(len=50) :: string = 'thermal'
       
       character (len=100) :: zedatafile
@@ -143 +143 @@
  
         
-        ierr =nf_open (trim(zedatafile)//'/surface.nc',
-     &  NF_NOWRITE,nid)
-     
-      IF (ierr.NE.nf_noerr) THEN
+        ierr=nf90_open(trim(zedatafile)//'/surface.nc',
+     &  NF90_NOWRITE,nid)
+     
+      IF (ierr.NE.nf90_noerr) THEN
        write(*,*)'Error : cannot open file surface.nc '
        write(*,*)'(in phymars/surfini.F)'
@@ -159 +159 @@
       
       
-      ierr = NF_INQ_VARID (nid, string, nvarid)
-      if (ierr.ne.nf_noerr) then
-        write(*,*) 'datareadnc error, cannot find ',trim(string)
+      ierr=nf90_inq_varid(nid, string, nvarid)
+      if (ierr.ne.nf90_noerr) then
+        write(*,*) 'surfini error, cannot find ',trim(string)
         write(*,*) ' in file ',trim(zedatafile),'/surface.nc'
+        write(*,*)trim(nf90_strerror(ierr))
         stop
       endif
-#ifdef NC_DOUBLE
-      ierr = NF_GET_VAR_DOUBLE(nid, nvarid, zdata)
-#else
-      ierr = NF_GET_VAR_REAL(nid, nvarid, zdata)
-#endif
-      if (ierr.ne.nf_noerr) then
-        write(*,*) 'datareadnc: error failed loading ',trim(string)
+
+      ierr=nf90_get_var(nid, nvarid, zdata)
+
+      if (ierr.ne.nf90_noerr) then
+        write(*,*) 'surfini: error failed loading ',trim(string)
+        write(*,*)trim(nf90_strerror(ierr))
         stop
       endif
  
                      
-      ierr=nf_close(nid)
+      ierr=nf90_close(nid)