Changeset 1470 for trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat

Timestamp:

Sep 16, 2015, 1:00:04 PM (9 years ago)

Author:

emillour

Message:

Generic GCM:

• reorganizing the "datadir" structure: aerosol properties should now be in subdirectory 'aerosol_properties' of datadir, and surface.nc files should be in subdirectory 'surface_data'. These subdirectory names are stored in module datafile_mod.
• Made things retro-compatible so that using an 'old' datadir structure (ie. aerosol properties files and surface files in datadir) still works.

EM

Location:

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd

Files:

• datareadnc.F (modified) (4 diffs)
• newstart.F (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/datareadnc.F

@@ -42 +42 @@
 c=======================================================================
 
-      use datafile_mod, only: datadir
+      use datafile_mod, only: datadir, surfdir
 ! to use  'getin'
       USE ioipsl_getincom 
@@ -94 +94 @@
       CHARACTER*20 string
       DIMENSION string(4)
-
 !#include "fxyprim.h"
 
@@ -106 +105 @@
 c    Lecture NetCDF des donnees latitude et longitude
 c-----------------------------------------------------------------------
-      ierr = NF_OPEN (trim(datadir)//'/'//trim(adjustl(filename)),
-     &  NF_NOWRITE,unit)
+      ierr = NF_OPEN (trim(datadir)//'/'//trim(surfdir)//'/'//
+     &                trim(adjustl(filename)),
+     &                NF_NOWRITE,unit)
+      IF (ierr.NE.NF_NOERR) THEN
+        ! In ye old days this file was stored in datadir;
+        ! let's be retro-compatible
+        ierr = NF_OPEN (trim(datadir)//'/'//
+     &                trim(adjustl(filename)),
+     &                NF_NOWRITE,unit)
+        
+      ENDIF
       IF (ierr.NE.NF_NOERR) THEN
         write(*,*)'Error : cannot open file '//trim(filename)
         write(*,*)'(in phystd/datareadnc.F)'
-        write(*,*)'It should be in :',trim(datadir),'/'
+        write(*,*)'It should be in :',trim(datadir),'/',trim(surfdir)
         write(*,*)'Check that your path to datagcm:',trim(datadir)
         write(*,*)' is correct. You can change it in callphys.def with:'
@@ -117 +125 @@
         write(*,*)'If necessary surface.nc (and other datafiles)'
         write(*,*)' can be obtained online on:'
-        write(*,*)' http://www.lmd.jussieu.fr/~forget/datagcm/datafile'
+        write(*,*)' http://www.lmd.jussieu.fr/~lmdz/planets/'//
+     &             'LMDZ.GENERIC/datagcm/'
         STOP
       ENDIF

trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

@@ -21 +21 @@
      &                     zmea, zstd, zsig, zgam, zthe
       USE comgeomfi_h, ONLY: lati, long, area
-      use datafile_mod, only: datadir
+      use datafile_mod, only: datadir, surfdir
 ! to use  'getin'
 !      USE ioipsl_getincom, only: getin
@@ -498 +498 @@
         call getin_p("datadir",datadir)
         write(*,*) 'Available surface data files are:'
-        filestring='ls '//trim(datadir)//' | grep .nc'
+        filestring='ls '//trim(datadir)//'/'//
+     &                    trim(surfdir)//' | grep .nc'
+        call system(filestring)
+        ! but in ye old days these files were in datadir, so scan it as well
+        ! for the sake of retro-compatibility
+        filestring='ls '//trim(datadir)//'/'//' | grep .nc'
         call system(filestring)