Changeset 1542 for trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Timestamp:

Apr 18, 2016, 8:45:35 AM (9 years ago)

Author:

emillour

Message:

Generic GCM:

• fix for 1D in writediagfi to enable writing at "ecritphy" rate.
• move iniprint.h to "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

Location:

trunk/LMDZ.GENERIC/libf/phystd/dyn1d

Files:

• iniprint.h (deleted)
• rcm1d.F (modified) (9 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -11 +11 @@
 !      use comsaison_h
       use comsoil_h, only: nsoilmx, layer, mlayer, inertiedat, volcapa
-      USE comgeomfi_h, only: lati, long, area
       use phyredem, only: physdem0,physdem1
-      use comgeomphy, only: initcomgeomphy, airephy
+      use comgeomphy, only: initcomgeomphy, cell_area
       use slab_ice_h, only: noceanmx
       use planete_mod, only: apoastr,periastr,year_day,peri_day,
@@ -159 +158 @@
       IF (.not.ALLOCATED(sinlon)) ALLOCATE(sinlon(1))
       IF (.not.ALLOCATED(coslon)) ALLOCATE(coslon(1))
-      !! those are defined in comgeomfi_h
-      IF (.not. ALLOCATED(lati)) ALLOCATE(lati(1))
-      IF (.not. ALLOCATED(long)) ALLOCATE(long(1))
-      IF (.not. ALLOCATED(area)) ALLOCATE(area(1))
-
 
       saveprofile=.false.
@@ -326 +320 @@
 !!! GEOGRAPHICAL INITIALIZATIONS
      !!! AREA. useless in 1D
-      area(1)=1.E+0
-      airephy(1)=area(1) !JL+EM to have access to the area in the diagfi.nc files. area in comgeomfi.h and aire in comgeom.h
+      cell_area(1)=1.E+0 !JL+EM to have access to the area in the diagfi.nc files.
      !!! GEOPOTENTIAL. useless in 1D because control by surface pressure
       phisfi(1)=0.E+0
@@ -511 +504 @@
       cpp=1.d-7 !JL because we divide by cpp in inifis, there may be a more elegant solution
       CALL inifis(1,llm,nq,day0,daysec,nday,dtphys,
-     .            latitude,longitude,area,rad,g,r,cpp)
+     .            latitude,longitude,cell_area,rad,g,r,cpp)
 
       nsoil=nsoilmx
@@ -673 +666 @@
          IF (qsurf(i_co2_ice).ge.1.E+0) THEN
             ! if we have some CO2 ice on the surface, change emissivity
-            if (lati(1).ge.0) then ! northern hemisphere
+            if (latitude(1).ge.0) then ! northern hemisphere
               emis(1)=emisice(1)
             else ! southern hemisphere
@@ -834 +827 @@
 c  It is needed to transfert physics variables to "physiq"...
 
-      call physdem0("startfi.nc",long,lati,nsoilmx,1,llm,nq,
-     &              dtphys,real(day0),time,area,
+      call physdem0("startfi.nc",longitude,latitude,nsoilmx,1,llm,nq,
+     &              dtphys,real(day0),time,cell_area,
      &              albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
       call physdem1("startfi.nc",nsoilmx,1,llm,nq,
@@ -843 +836 @@
      &                rnat,pctsrf_sic,tslab,tsea_ice,sea_ice)
 
-!      call physdem1(1,"startfi.nc",long,lati,nsoilmx,nq,
-!     &              dtphys,float(day0),
-!     &              time,tsurf,tsoil,emis,q2,qsurf,
-!     &              area,albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe,
-!     &              cloudfrac,totcloudfrac,hice,nametrac)
-
 c=======================================================================
 c  BOUCLE TEMPORELLE DU MODELE 1D 
@@ -861 +848 @@
          call stellarlong(day*1.0,zls)
 !         write(103,*) 'Ls=',zls*180./pi
-!         write(103,*) 'Lat=', lati(1)*180./pi
+!         write(103,*) 'Lat=', latitude(1)*180./pi
 !         write(103,*) 'RunEnd - Atmos. Temp. File'
 !         write(103,*) 'RunEnd - Atmos. Temp. File'
 !         write(104,*) 'Ls=',zls*180./pi
-!         write(104,*) 'Lat=', lati(1)
+!         write(104,*) 'Lat=', latitude(1)
 !         write(104,*) 'RunEnd - Atmos. Temp. File'
         ENDIF
@@ -923 +910 @@
 
 c       Pour certain test : pas de coriolis a l'equateur
-c       if(lati(1).eq.0.) then
+c       if(latitude(1).eq.0.) then
           DO ilayer=1,nlayer
              du(ilayer)=du(ilayer)+ (gru-u(ilayer))/1.e4