Changeset 1918 for trunk/LMDZ.MARS/libf/dynlonlat_phylonlat

Timestamp:

Apr 12, 2018, 8:35:48 AM (7 years ago)

Author:

emillour

Message:

Mars GCM:
Code cleanup:

• remove "comorbit.h" since it is no longer used.
• turn "datafile.h" into module datafile_mod.F90 (and rename variable "datafile" as "datadir" since it stores the path to the datafile directory).

EM

Location:

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars

Files:

• datareadnc.F (modified) (3 diffs)
• newstart.F (modified) (3 diffs)

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/datareadnc.F

@@ -45 +45 @@
        use ioipsl_getincom 
       USE comconst_mod, ONLY: g,pi
+      use datafile_mod, only: datadir
 
       implicit none
 
-#include "dimensions.h"
-#include "paramet.h"
-#include "comgeom.h"
-#include "netcdf.inc"
-#include "datafile.h"
+      include "dimensions.h"
+      include "paramet.h"
+      include "comgeom.h"
+      include "netcdf.inc"
 
 c=======================================================================
@@ -113 +113 @@
       write(*,*) 'datareadnc: opening file surface.nc'
 
-      datafile="/u/lmdz/WWW/planets/mars/datadir" ! default path to surface.nc
-      call getin("datadir",datafile) ! but users may specify another path
+      datadir="/u/lmdz/WWW/planets/mars/datadir" ! default path to surface.nc
+      call getin("datadir",datadir) ! but users may specify another path
       
-      ierr = NF_OPEN (trim(datafile)//'/surface.nc',
+      ierr = NF_OPEN (trim(datadir)//'/surface.nc',
      &  NF_NOWRITE,unit)
       IF (ierr.NE.NF_NOERR) THEN
         write(*,*)'Error : cannot open file surface.nc '
         write(*,*)'(in phymars/datareadnc.F)'
-        write(*,*)'It should be in :',trim(datafile),'/'
+        write(*,*)'It should be in :',trim(datadir),'/'
         write(*,*)'1) You can set this path in the 
      & callphys.def file:'
@@ -210 +210 @@
       if (ierr.ne.nf_noerr) then
         write(*,*) 'datareadnc error, cannot find ',trim(string(k))
-        write(*,*) ' in file ',trim(datafile),'/surface.nc'
+        write(*,*) ' in file ',trim(datadir),'/surface.nc'
         stop
       endif

trunk/LMDZ.MARS/libf/dynlonlat_phylonlat/phymars/newstart.F

@@ -51 +51 @@
 #include "clesph0.h"
 #include "netcdf.inc"
-#include "datafile.h"
 c=======================================================================
 c   Declarations
@@ -1680 +1679 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
       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
       ! polar region, and interpolate the result onto the GCM grid
-#include"dimensions.h"
-#include"paramet.h"
-#include"datafile.h"
-#include"comgeom.h"
+      include"dimensions.h"
+      include"paramet.h"
+      include"comgeom.h"
       ! arguments:
       real,intent(out) :: MONS_Hdn(iip1,jjp1) ! Hdn: %WEH=Mass fraction of H2O
@@ -1715 +1716 @@
 
       ! 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'
+     &             trim(datadir)//"/"//trim(filename)
+        write(*,*)'1) You can change this directory address in ',
+     &            'callfis.def with'
+        write(*,*)'   datadir=/path/to/datafiles'
         write(*,*)'2) If necessary ',trim(filename),
      &                 ' (and other datafiles)'