Changeset 1918 for trunk/LMDZ.MARS/libf/phymars/albedocaps.F90

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

File:

• trunk/LMDZ.MARS/libf/phymars/albedocaps.F90 (modified) (5 diffs)

trunk/LMDZ.MARS/libf/phymars/albedocaps.F90

@@ -90 +90 @@
 use geometry_mod, only: latitude, longitude ! in radians
 use surfdat_h, only: albedice, TESice_Ncoef, TESice_Scoef
+use datafile_mod, only: datadir
 use netcdf, only: nf90_open, NF90_NOWRITE, NF90_NOERR, &
                   nf90_strerror, nf90_inq_varid, nf90_get_var, nf90_close
                   
 implicit none
-include"datafile.h"
 
 ! arguments:
@@ -151 +151 @@
 if (firstcall) then
 ! Load TES albedoes for Northern Hemisphere
-  ! Note: datafile() is defined in "datafile.h"
-  ierr=nf90_open(trim(datafile)//"/npsc_albedo.nc",NF90_NOWRITE,nid)
+  ierr=nf90_open(trim(datadir)//"/npsc_albedo.nc",NF90_NOWRITE,nid)
   IF (ierr.NE.NF90_NOERR) THEN
     write(*,*)'Problem opening npsc_albedo.nc (phymars/albedocaps.F90)'
-    write(*,*)'It should be in :',trim(datafile),'/'
+    write(*,*)'It should be in :',trim(datadir),'/'
     write(*,*)'1) You can change this directory address in callfis.def with'
     write(*,*)'   datadir=/path/to/datafiles'
@@ -163 +162 @@
     CALL ABORT
   ELSE
-    write(*,*) "albedocaps: using file ",trim(datafile)//"/npsc_albedo.nc"
+    write(*,*) "albedocaps: using file ",trim(datadir)//"/npsc_albedo.nc"
   ENDIF
   
@@ -225 +224 @@
 
 ! Load albedoes for Southern Hemisphere
-  ierr=nf90_open(trim(datafile)//"/spsc_albedo.nc",NF90_NOWRITE,nid)
+  ierr=nf90_open(trim(datadir)//"/spsc_albedo.nc",NF90_NOWRITE,nid)
   IF (ierr.NE.NF90_NOERR) THEN
     write(*,*)'Problem opening spsc_albedo.nc (phymars/albedocaps.F90)'
-    write(*,*)'It should be in :',trim(datafile),'/'
+    write(*,*)'It should be in :',trim(datadir),'/'
     write(*,*)'1) You can change this directory address in callfis.def with'
     write(*,*)'   datadir=/path/to/datafiles'
@@ -236 +235 @@
     CALL ABORT
   ELSE
-    write(*,*) "albedocaps: using file ",trim(datafile)//"/spsc_albedo.nc"
+    write(*,*) "albedocaps: using file ",trim(datadir)//"/spsc_albedo.nc"
   ENDIF