Changeset 1790 for trunk/LMDZ.TITAN/libf/dyn3d

Timestamp:

Sep 29, 2017, 1:57:44 PM (8 years ago)

Author:

jvatant

Message:

Update 1D model that hasn't been cleaned since migration from generic

+ remove co2,water, kcm ...
+ added moyzon

Also correct deftank according to r1788
--JVO

Location:

trunk/LMDZ.TITAN/libf/dyn3d

Files:

• disvert.F (modified) (4 diffs)
• logic_mod.F90 (modified) (1 diff)

trunk/LMDZ.TITAN/libf/dyn3d/disvert.F ¶

@@ -3 +3 @@
 ! to use  'getin'
       USE ioipsl_getincom 
-      USE callkeys_mod, ONLY: kastprof,pceil
+      USE callkeys_mod, ONLY: pceil
       USE comvert_mod, ONLY: ap,bp,sig,nivsigs,nivsig,pa,preff,
      .                  aps,bps,presnivs,pseudoalt,scaleheight
@@ -64 +64 @@
       write(*,*) " autozlevs = ", autozlevs
 
-      write(*,*)"Operate in kastprof mode?"
-      kastprof=.false.
-      call getin("kastprof",kastprof)
-      write(*,*)" kastprof = ",kastprof
-
-      print*,'kast=',kastprof
-
       pceil=100.0 ! Pascals
       PRINT *,'Ceiling pressure (Pa) ?'
@@ -81 +74 @@
       endif
 
-      if(kastprof.and.iim.gt.1)then
-         print*,'kastprof no good in 3D...'
-         call abort
-      endif
-
       psurf=610. ! default value for psurf
       PRINT *,'Surface pressure (Pa) ?'
@@ -91 +79 @@
       write(*,*) " psurf = ",psurf
 
-      if(kastprof)then
-
-        sig(1)=1
-        do l=2,llm
-                                !sig(l)=1. - real(l-1)/real(llm) ! uses linear sigma spacing
-                                !sig(l)=exp(-real(l-1)*h/real(llm)) ! uses log sigma spacing
-                                !sig(l)=exp(-real(l-1)*Hmax/real(llm)) ! uses log sigma spacing
-           sig(l)=(pceil/psurf)**(real(l-1)/real(llm)) ! uses log sigma spacing
-           
-        end do
-        sig(llm+1)=0
-
-      elseIF(ierr4.eq.0)then
+      IF(ierr4.eq.0)then
          PRINT*,'****************************'
          PRINT*,'Lecture de z2sig.def'

trunk/LMDZ.TITAN/libf/dyn3d/logic_mod.F90 ¶

@@ -3 +3 @@
 IMPLICIT NONE  
 
-LOGICAL purmats,forward,leapf,apphys,statcl,conser, &
-     & apdiss,apdelq,saison,ecripar,fxyhypb,ysinus,hybrid,autozlevs
+  LOGICAL purmats ! true if time stepping is purely Matsuno scheme
+                  ! false implies Matsuno-Leapfrog time stepping scheme
+  LOGICAL forward ! true if during forward phase of Matsuno step
+  LOGICAL leapf ! true if during a leapfrog time stepping step
+  LOGICAL apphys ! true if during a time step when physics will be called
+  LOGICAL statcl
+  LOGICAL conser
+  LOGICAL apdiss ! true if during a time step when dissipation will be called
+  LOGICAL apdelq
+  LOGICAL saison
+  LOGICAL ecripar
+  LOGICAL fxyhypb ! true if using hyperbolic function discretization
+                  ! for latitudinal grid 
+  LOGICAL ysinus ! true if using sine function discretiation
+                 ! for latitudinal grid
+  LOGICAL read_start ! true if reading a start.nc file to initialize fields
+  LOGICAL ok_guide ! true if nudging
+  LOGICAL ok_strato
+  LOGICAL tidal  ! true if adding tidal forces (for Titan)
+  LOGICAL ok_gradsfile
+  LOGICAL ok_limit  ! true for boundary conditions file creation (limit.nc)
+  LOGICAL ok_etat0  ! true for initial states creation (start.nc, startphy.nc)
+  LOGICAL read_orop ! true for sub-cell scales orographic params read in file
+  LOGICAL hybrid ! vertical coordinate is hybrid if true (sigma otherwise)
+                 ! (only used if disvert_type==2)
+  LOGICAL autozlevs ! true if auto-discretization of vertical levels
+  LOGICAL moyzon_mu,moyzon_ch ! used for zonal averages in Titan
 
-INTEGER iflag_phys ! ==1 if calling a physics package
+  INTEGER iflag_phys ! type of physics to call: 0 none, 1: phy*** package,
+                     ! 2: Held & Suarez, 101-200: aquaplanets & terraplanets
+  INTEGER iflag_trac
 
 END MODULE logic_mod