Changeset 2311 for trunk/LMDZ.MARS/libf/aeronomars

Timestamp:

May 6, 2020, 1:46:00 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Code tidying: use getin_p() instead of getin() and use "call abort_physic"
instead of "stop" or "call abort".
EM

Location:

trunk/LMDZ.MARS/libf/aeronomars

Files:

• perosat.F (modified) (3 diffs)
• read_phototable.F90 (modified) (3 diffs)

trunk/LMDZ.MARS/libf/aeronomars/perosat.F

@@ -5 +5 @@
       use tracer_mod, only: igcm_h2o2, mmol
       use conc_mod, only: mmean
-      USE comcstfi_h
+      use comcstfi_h, only: g
       IMPLICIT NONE
 
@@ -32 +32 @@
       integer,intent(in) :: nlayer  ! number of atmospheric layers
       integer,intent(in) :: nq      ! number of tracers
-      INTEGER ig
-      REAL ptimestep                ! pas de temps physique (s)
-      REAL pplev(ngrid,nlayer+1)    ! pression aux inter-couches (Pa)
-      REAL pplay(ngrid,nlayer)      ! pression au milieu des couches (Pa)
-      REAL zt(nlayer)               ! temperature au centre des couches (K)
+      INTEGER,INTENT(IN) :: ig
+      REAL,INTENT(IN) :: ptimestep  ! pas de temps physique (s)
+      REAL,INTENT(IN) :: pplev(ngrid,nlayer+1)! pression aux inter-couches (Pa)
+      REAL,INTENT(IN) :: pplay(ngrid,nlayer)  ! pression au milieu des couches (Pa)
+      REAL,INTENT(IN) :: zt(nlayer) ! temperature au centre des couches (K)
                                     ! deja mise a jour dans calchim
 
 c   Traceurs :
-      real zy(nlayer,nq)        ! traceur (fraction molaire sortie chimie)
-      real pdqcloud(ngrid,nlayer,nq) ! tendance condensation (kg/kg.s-1)
-      real pdqscloud(ngrid,nq)         ! flux en surface (kg.m-2.s-1)
+      real,intent(in) :: zy(nlayer,nq) ! traceur (fraction molaire sortie chimie)
+      real,intent(out) :: pdqcloud(ngrid,nlayer,nq) ! tendance condensation (kg/kg.s-1)
+      real,intent(out) :: pdqscloud(ngrid,nq)       ! flux en surface (kg.m-2.s-1)
       
 c   local:
@@ -67 +67 @@
          if (igcm_h2o2.eq.0) then
            write(*,*) "perosat: error; no h2o2 tracer !!!!"
-           stop
+           call abort_physic("perosat","missing h2o2 tracer",1)
          endif
          firstcall=.false.

trunk/LMDZ.MARS/libf/aeronomars/read_phototable.F90

@@ -21 +21 @@
 !***********************************************************************
 
-      use ioipsl_getincom, only: getin
+      use ioipsl_getin_p_mod, only: getin_p
       use datafile_mod, only: datadir
 
@@ -45 +45 @@
 ! look for a " phototable= ..." option in def files
 
-      call getin("phototable",phototable)
+      call getin_p("phototable",phototable)
 
       fic = 81
@@ -61 +61 @@
         write(*,*)'   callphys.def with:'
         write(*,*)'   phototable=filename'
-        stop
+        call abort_physic("read_phototable","missing "//trim(phototable)//"file",1)
       end if