Changeset 374 for trunk/LMDZ.GENERIC/libf/dyn3d/newstart.F

Timestamp:

Nov 10, 2011, 3:08:51 PM (13 years ago)

Author:

emillour

Message:

Generic GCM: Upgrade: The location of the 'datagcm' directory can now be given in the callphys.def file ( datadir = /absolute/path/to/datagcm ). Changed "datafile.h" into a F90 module "datafile_mod.F90" and spread this change to all routines that used to use "datafile.h".
EM

File:

• trunk/LMDZ.GENERIC/libf/dyn3d/newstart.F (modified) (3 diffs)

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

@@ -1836 +1836 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       subroutine load_MONS_data(MONS_Hdn,MONS_d21)
+      use datafile_mod, only: datadir
       implicit none
       ! routine to load Benedicte Diez MONS dataset, fill in date in southern
@@ -1841 +1842 @@
 #include"dimensions.h"
 #include"paramet.h"
-#include"datafile.h"
 #include"comgeom.h"
       ! arguments:
@@ -1871 +1871 @@
 
       ! Open MONS datafile:
-      open(42,file=trim(datafile)//"/"//trim(filename),
+      open(42,file=trim(datadir)//"/"//trim(filename),
      &     status="old",iostat=ierr)
       if (ierr/=0) then
         write(*,*) "Error in load_MONS_data:"
         write(*,*) "Failed opening file ",
-     &             trim(datafile)//"/"//trim(filename)
-        write(*,*)'1) You can change the path to the file in '
-        write(*,*)'   file phymars/datafile.h'
-        write(*,*)'2) If necessary ',trim(filename),
+     &             trim(datadir)//"/"//trim(filename)
+        write(*,*)'Check that your path to datagcm:',trim(datadir)
+        write(*,*)' is correct. You can change it in callphys.def with:'
+        write(*,*)' datadir = /absolute/path/to/datagcm'
+        write(*,*)'If necessary ',trim(filename),
      &                 ' (and other datafiles)'
         write(*,*)'   can be obtained online at:'