Changeset 1541 for trunk/LMDZ.MARS/libf/phymars/dyn1d

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

Location:

trunk/LMDZ.MARS/libf/phymars/dyn1d

Files:

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

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F

@@ -5 +5 @@
       use infotrac, only: nqtot, tname
       use comsoil_h, only: volcapa, layer, mlayer, inertiedat, nsoilmx
-      use comgeomfi_h, only: lati, long, area, sinlat, ini_fillgeom
+      use comgeomfi_h, only: sinlat, ini_fillgeom
       use surfdat_h, only: albedodat, z0_default, emissiv, emisice,
      &                     albedice, iceradius, dtemisice, z0,
@@ -12 +12 @@
       use slope_mod, only: theta_sl, psi_sl
       use phyredem, only: physdem0,physdem1
-      use comgeomphy, only: initcomgeomphy, airephy, cuphy, cvphy,
-     &                      rlond, rlatd
+      use comgeomphy, only: initcomgeomphy, cell_area
       use planete_h, only: year_day, periheli, aphelie, peri_day,
      &                     obliquit, emin_turb, lmixmin
@@ -534 +533 @@
 c   -------------------------------------
 c   mesh surface (not a very usefull quantity in 1D)
-      area(1)=1.E+0
-      airephy(1)=area(1)
+      cell_area(1)=1.E+0
 
 c   surface geopotential is not used (or useful) since in 1D
@@ -560 +558 @@
          u(ilayer)=gru
          v(ilayer)=grv
+         w(ilayer)=0 ! default: no vertical wind
       ENDDO
 
@@ -580 +579 @@
       IF (co2ice(1).eq.1.E+0) THEN
          emis=emisice(1) ! northern hemisphere
-         IF(lati(1).LT.0) emis=emisice(2) ! southern hemisphere
+         IF(latitude(1).LT.0) emis=emisice(2) ! southern hemisphere
       ENDIF
 
@@ -654 +653 @@
          ! thermo=0: initialize over all atmospheric layers
          thermo=0
-         call inichim_newstart(q,psurf,sig,nq,lati,long,area,
-     $   thermo,qsurf)
+         call inichim_newstart(q,psurf,sig,nq,latitude,longitude,
+     $   cell_area,thermo,qsurf)
       endif
 
@@ -683 +682 @@
 c  It is needed to transfert physics variables to "physiq"...
 
-      call physdem0("startfi.nc",long,lati,nsoilmx,ngrid,llm,nq,
-     .              dtphys,float(day0),time,area,
-     .              albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
+      call physdem0("startfi.nc",longitude,latitude,nsoilmx,ngrid,llm,
+     &              nq,dtphys,float(day0),time,cell_area,
+     &              albedodat,inertiedat,zmea,zstd,zsig,zgam,zthe)
       call physdem1("startfi.nc",nsoilmx,ngrid,llm,nq,
      .              dtphys,time,
@@ -703 +702 @@
          call solarlong(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,*) 'Tau=', tauvis/odpref*psurf
          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,*) 'Tau=', tauvis/odpref*psurf
          write(104,*) 'RunEnd - Atmos. Temp. File'
@@ -753 +752 @@
 
 c       For some tests : No coriolis force at equator
-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