Changeset 1470 for trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F

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

File:

• trunk/LMDZ.GENERIC/libf/dynlonlat_phylonlat/phystd/newstart.F (modified) (2 diffs)

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)