Changeset 1246 for trunk/LMDZ.MARS/libf/phymars/callradite.F

Timestamp:

May 11, 2014, 2:37:58 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. Made number of scatterers a free dimension not in need to be prescribe at compiling time. Instead it must be set in callphys.def. See README for further information about this commit.

File:

• trunk/LMDZ.MARS/libf/phymars/callradite.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/callradite.F

@@ -6 +6 @@
 
       use dimradmars_mod, only: ndomainsz, nflev, nsun, nir
+      use dimradmars_mod, only: naerkind, name_iaer,
+     &            iaer_dust_conrath,iaer_dust_doubleq,
+     &            iaer_dust_submicron,iaer_h2o_ice
       use yomlw_h, only: gcp, nlaylte
       USE comcstfi_h
@@ -153 +156 @@
 #include "callkeys.h"
 !#include "yomlw.h"
-! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
-#include"scatterers.h"
-#include "aerkind.h"
 
 c-----------------------------------------------------------------------
@@ -272 +272 @@
         allocate(pview(ngrid))
 
-c        Please name the different scatterers here ----------------
-c        PLEASE MAKE SURE that you set up the right number of
-c          scatterers in scatterers.h (naerkind);
-          name_iaer(1) = "dust_conrath"   !! default choice is good old Conrath profile
-          IF (doubleq.AND.active) name_iaer(1) = "dust_doubleq" !! two-moment scheme
-          if (nq.gt.1) then
-           ! trick to avoid problems compiling with 1 tracer
-           ! and picky compilers who know name_iaer(2) is out of bounds
-           j=2
-          IF (water.AND.activice) name_iaer(j) = "h2o_ice"      !! radiatively-active clouds
-          IF (submicron.AND.active) name_iaer(j) = "dust_submicron" !! JBM experimental stuff
-          endif ! of if (nq.gt.1)
-c        ----------------------------------------------------------
-
 c        Assign a number to the different scatterers
 c        -------------------------------------------
@@ -352 +338 @@
          ENDDO
          gcp = g/cpp
-
-c        Logical tests for radiatively active water-ice clouds:
-         IF ( (activice.AND.(.NOT.water)).OR.
-     &        (activice.AND.(naerkind.LT.2)) ) THEN
-           WRITE(*,*) 'If activice is TRUE, water has to be set'
-           WRITE(*,*) 'to TRUE, and "naerkind" must be at least'
-           WRITE(*,*) 'equal to 2 in scatterers.h.'
-           CALL ABORT
-         ELSE IF ( (.NOT.activice).AND.(naerkind.GT.1) ) THEN
-           WRITE(*,*) 'naerkind is greater than unity, but'
-           WRITE(*,*) 'activice has not been set to .true.'
-           WRITE(*,*) 'in callphys.def; this is not logical!'
-           CALL ABORT
-         ENDIF
 
 c        Loading the optical properties in external look-up tables: