Changeset 697 for trunk/LMDZ.MARS/libf

Timestamp:

Jun 6, 2012, 10:56:42 AM (13 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

Location:

trunk/LMDZ.MARS/libf

Files:

• dyn3d/calfis.F (modified) (1 diff)
• dyn3d/newstart.F (modified) (1 diff)
• phymars/phyetat0.F (modified) (2 diffs)
• phymars/surfini.F (modified) (5 diffs)

trunk/LMDZ.MARS/libf/dyn3d/calfis.F

@@ -178 +178 @@
          latfi(ngridmx)= rlatu(jjp1)
          lonfi(ngridmx)= 0.
+         
+         ! build airefi(), mesh area on physics grid
          CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
+         ! Poles are single points on physics grid
+         airefi(1)=airefi(1)*iim
+         airefi(ngridmx)=airefi(ngridmx)*iim
 
          CALL inifis(ngridmx,llm,day_ini,daysec,dtphys,

trunk/LMDZ.MARS/libf/dyn3d/newstart.F

@@ -347 +347 @@
       latfi(ngridmx)=rlatu(jjp1)
       lonfi(ngridmx)=0.
+      
+      ! build airefi(), mesh area on physics grid
       CALL gr_dyn_fi(1,iip1,jjp1,ngridmx,aire,airefi)
+      ! Poles are single points on physics grid
+      airefi(1)=airefi(1)*iim
+      airefi(ngridmx)=airefi(ngridmx)*iim
 
 ! also initialize various physics flags/settings which might be needed

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

@@ -17 +17 @@
 #include "dimensions.h"
 #include "dimphys.h"
-#include "comgeomfi.h"
+!#include "comgeomfi.h"
 #include "surfdat.h"
 #include "planete.h"
@@ -113 +113 @@
      .              p_omeg,p_g,p_mugaz,p_daysec,time)
 c
-c Lecture des latitudes (coordonnees):
-c
-      ierr=nf90_inq_varid(nid,"latitude",nvarid)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Le champ <latitude> est absent'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-      ierr=nf90_get_var(nid,nvarid,lati)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Lecture echouee pour <latitude>'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-c
-c Lecture des longitudes (coordonnees):
-c
-      ierr=nf90_inq_varid(nid,"longitude",nvarid)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Le champ <longitude> est absent'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-      ierr=nf90_get_var(nid,nvarid,long)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Lecture echouee pour <longitude>'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-c
-c Lecture des aires des mailles:
-c
-      ierr=nf90_inq_varid(nid,"area",nvarid)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Le champ <area> est absent'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-      ierr=nf90_get_var(nid,nvarid,area)
-      IF (ierr.NE.nf90_noerr) THEN
-         PRINT*, 'phyetat0: Lecture echouee pour <area>'
-         write(*,*)trim(nf90_strerror(ierr))
-         CALL abort
-      ENDIF
-      xmin = 1.0E+20
-      xmax = -1.0E+20
-      xmin = MINVAL(area)
-      xmax = MAXVAL(area)
-      PRINT*,'Aires des mailles <area>:', xmin, xmax
+c Read latitudes (coordinates): No need, these are provided by the dynamics
+c
+!      ierr=nf90_inq_varid(nid,"latitude",nvarid)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Le champ <latitude> est absent'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+!      ierr=nf90_get_var(nid,nvarid,lati)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Lecture echouee pour <latitude>'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+c
+c read longitudes (coordinates): No need, these are provided by the dynamics
+c
+!      ierr=nf90_inq_varid(nid,"longitude",nvarid)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Le champ <longitude> est absent'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+!      ierr=nf90_get_var(nid,nvarid,long)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Lecture echouee pour <longitude>'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+c
+c Read areas of meshes: No need, these are provided by the dynamics
+c
+!      ierr=nf90_inq_varid(nid,"area",nvarid)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Le champ <area> est absent'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+!      ierr=nf90_get_var(nid,nvarid,area)
+!      IF (ierr.NE.nf90_noerr) THEN
+!         PRINT*, 'phyetat0: Lecture echouee pour <area>'
+!         write(*,*)trim(nf90_strerror(ierr))
+!         CALL abort
+!      ENDIF
+!      xmin = 1.0E+20
+!      xmax = -1.0E+20
+!      xmin = MINVAL(area)
+!      xmax = MAXVAL(area)
+!      PRINT*,'Aires des mailles <area>:', xmin, xmax
 c
 c Lecture du geopotentiel au sol:

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)