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

Timestamp:

Apr 17, 2016, 10:23:21 PM (9 years ago)

Author:

emillour

Message:

Mars GCM:

• fix for 1D in writediagfi to enable writing at "ecritphy" rate.
• removed iniprint.h from phymars/dyn1d since it is in "misc"
• Some code cleanup in anticipation of future updates:
  • changed variable names in comgeomphy.F90: give them more explicit names: rlond => longitude , rlatd => latitude, airephy => cell_area, cuphy => dx , cvphy => dy
  • removed long(), lati() and area() from comgeomfi_h.F90, use longitude(), latitude() and cell_are() from comgeomphy.F90 instead

EM

File:

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

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

@@ -6 +6 @@
 ! to use the 'getin' routine 
 use ioipsl_getincom, only: getin
-use comgeomfi_h, only: lati ! grid point latitudes (rad)
+use comgeomphy, only: latitude ! grid point latitudes (rad)
 use surfdat_h, only: TESicealbedo, TESice_Ncoef, TESice_Scoef, &
                      emisice, albedice, watercaptag, albedo_h2o_ice, &
@@ -51 +51 @@
 
 do ig=1,ngrid
-  if (lati(ig).lt.0.) then
+  if (latitude(ig).lt.0.) then
     icap=2 ! Southern hemisphere
   else
@@ -87 +87 @@
 subroutine TES_icecap_albedo(zls,ig,alb,icap)
 
-use comgeomfi_h, only: lati, long
+use comgeomphy, only: latitude, longitude ! in radians
 use surfdat_h, only: albedice, TESice_Ncoef, TESice_Scoef
 use netcdf, only: nf90_open, NF90_NOWRITE, NF90_NOERR, &
@@ -281 +281 @@
 ! Check that latitude is such that there is TES data to use
 ! (ie: latitude 45 deg and poleward) otherwise use 'default' albedoes
-latd=lati(ig)*radeg ! latitude, in degrees
+latd=latitude(ig)*radeg ! latitude, in degrees
 if (icap.eq.1) then
  ! North hemisphere
@@ -360 +360 @@
 
 ! 3. Identify encompassing longitudes
-lond=long(ig)*radeg ! east longitude, in degrees
+lond=longitude(ig)*radeg ! east longitude, in degrees
 if (lond.lt.TESlon(1)) then
   loninf=TESlonsize