Changeset 1047 for trunk/LMDZ.MARS/libf/phymars/inifis.F

Timestamp:

Sep 23, 2013, 9:56:47 AM (11 years ago)

Author:

emillour

Message:

Mars GCM:

• IMPORTANT CHANGE: Removed all reference/use of ngridmx (dimphys.h) in routines (necessary prerequisite to using parallel dynamics); in most cases this just means adding 'ngrid' as routine argument, and making local saved variables allocatable (and allocated at first call). In the process, had to convert many *.h files to equivalent modules: yomaer.h => yomaer_h.F90 , surfdat.h => surfdat_h.F90 , comsaison.h => comsaison_h.F90 , yomlw.h => yomlw_h.F90 , comdiurn.h => comdiurn_h.F90 , dimradmars.h => dimradmars_mod.F90 , comgeomfi.h => comgeomfi_h.F90, comsoil.h => comsoil_h.F90 , slope.h => slope_mod.F90
• Also updated EOF routines, everything is now in eofdump_mod.F90
• Removed unused routine lectfux.F (in dyn3d)

EM

File:

• trunk/LMDZ.MARS/libf/phymars/inifis.F (modified) (5 diffs)

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

@@ -48 +48 @@
       USE ioipsl_getincom, only : getin
       use tracer_mod, only : nqmx, nuice_sed, ccn_factor
-      
+      use comsoil_h, only: ini_comsoil_h
+#ifdef MESOSCALE
+      use comsoil_h, only: volcapa !!MESOSCALE -- needed to fill volcapa
+#endif      
+      use comgeomfi_h, only: long, lati, area, totarea
+      use comdiurn_h, only: sinlat, coslat, sinlon, coslon
+      use surfdat_h, only: ini_surfdat_h, albedo_h2o_ice, inert_h2o_ice,
+     &                     frost_albedo_threshold
+      use comsaison_h, only: ini_comsaison_h
+      use slope_mod, only: ini_slope_mod
+      use dimradmars_mod, only: ini_dimradmars_mod
+      use yomaer_h,only: ini_yomaer_h, tauvis
+      use yomlw_h, only: ini_yomlw_h
+      use conc_mod, only: ini_conc_mod
       IMPLICIT NONE
 #include "dimensions.h"
@@ -54 +67 @@
 #include "planete.h"
 #include "comcstfi.h"
-#include "comsaison.h"
-#include "comdiurn.h"
-#include "comgeomfi.h"
+!#include "comsaison.h"
+!#include "comdiurn.h"
+!#include "comgeomfi.h"
 #include "callkeys.h"
-#include "surfdat.h"
-#include "dimradmars.h"
-#include "yomaer.h"
+!#include "surfdat.h"
+!#include "dimradmars.h"
+!#include "yomaer.h"
 #include "datafile.h"
-#include "slope.h"
+!#include "slope.h"
 #include "microphys.h"
 !#include "tracer.h"
+! naerkind is set in scatterers.h (built when compiling with makegcm -s #)
+#include"scatterers.h"
 #ifdef MESOSCALE
-#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
+!#include "comsoil.h"     !!MESOSCALE -- needed to fill volcapa
 #include "meso_inc/meso_inc_inifisvar.F"
 #endif
@@ -107 +122 @@
 !     The usual Tests
 !     --------------
-      IF (nlayer.NE.nlayermx) THEN
-         PRINT*,'STOP in inifis'
-         PRINT*,'Probleme de dimensions :'
-         PRINT*,'nlayer     = ',nlayer
-         PRINT*,'nlayermx   = ',nlayermx
-         STOP
-      ENDIF
-
-      IF (ngrid.NE.ngridmx) THEN
-         PRINT*,'STOP in inifis'
-         PRINT*,'Probleme de dimensions :'
-         PRINT*,'ngrid     = ',ngrid
-         PRINT*,'ngridmx   = ',ngridmx
-         STOP
-      ENDIF
+!      IF (nlayer.NE.nlayermx) THEN
+!         PRINT*,'STOP in inifis'
+!         PRINT*,'Probleme de dimensions :'
+!         PRINT*,'nlayer     = ',nlayer
+!         PRINT*,'nlayermx   = ',nlayermx
+!         STOP
+!      ENDIF
+
+!      IF (ngrid.NE.ngridmx) THEN
+!         PRINT*,'STOP in inifis'
+!         PRINT*,'Probleme de dimensions :'
+!         PRINT*,'ngrid     = ',ngrid
+!         PRINT*,'ngridmx   = ',ngridmx
+!         STOP
+!      ENDIF
 
 ! --------------------------------------------------------------
@@ -765 +780 @@
 !     ------------------------
 
-      ! in 'comgeomfi.h'
+      ! allocate "slope_mod" arrays
+      call ini_slope_mod(ngrid)
+      
+      ! allocate "comsaison_h" arrays
+      call ini_comsaison_h(ngrid)
+      
+      ! allocate "surfdat_h" arrays
+      call ini_surfdat_h(ngrid)
+      
+      ! allocate "comgeomfi_h" arrays
+      allocate(lati(ngrid))
+      allocate(long(ngrid))
+      allocate(area(ngrid))
+      
+      ! fill "comgeomfi_h" data
       CALL SCOPY(ngrid,plon,1,long,1)
       CALL SCOPY(ngrid,plat,1,lati,1)
       CALL SCOPY(ngrid,parea,1,area,1)
-      totarea=SSUM(ngridmx,area,1)
-
-      ! in 'comdiurn.h'
+      totarea=SSUM(ngrid,area,1)
+
+      ! allocate "comdiurn_h" data
+      allocate(sinlat(ngrid))
+      allocate(coslat(ngrid))
+      allocate(sinlon(ngrid))
+      allocate(coslon(ngrid))
+      
+      ! fill "comdiurn_h" data
       DO ig=1,ngrid
          sinlat(ig)=sin(plat(ig))
@@ -781 +816 @@
       pi=2.*asin(1.) ! NB: pi is a common in comcstfi.h
 
-!     managing the tracers, and tests:
-!     -------------------------------
-!     Ehouarn: removed; as these tests are now done in initracer.F
-!      if(tracer) then
-!
-!!          when photochem is used, nqchem_min is the rank
-!!          of the first chemical species
-!
-!! Ehouarn: nqchem_min is now meaningless and no longer used
-!!       nqchem_min = 1
-!       if (photochem .or. callthermos) then
-!         chem = .true.
-!       end if
-!
-!       if (water .or. thermoswater) h2o = .true.
-!
-!!          TESTS
-!
-!       print*,'inifis: TRACERS:'
-!       write(*,*) "    chem=",chem,"    h2o=",h2o
-!!       write(*,*) "   doubleq=",doubleq
-!!       write(*,*) "   dustbin=",dustbin
-!
-!       if ((doubleq).and.(h2o).and.
-!     $     (chem)) then
-!         print*,' 2 dust tracers (doubleq)'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         print*,nq-4,' chemistry tracers'
-!       endif
-!
-!       if ((doubleq).and.(h2o).and.
-!     $     .not.(chem)) then
-!         print*,' 2 dust tracers (doubleq)'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         if (nq.LT.4) then
-!           print*,'nq should be at least equal to'
-!           print*,'4 with these options.'
-!           stop
-!         endif
-!       endif
-!
-!       if (.not.(doubleq).and.(h2o).and.
-!     $     (chem)) then
-!         if (dustbin.gt.0) then
-!           print*,dustbin,' dust bins'
-!         endif
-!         print*,nq-2-dustbin,' chemistry tracers'
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!       endif
-!
-!       if (.not.(doubleq).and.(h2o).and.
-!     $     .not.(chem)) then
-!         if (dustbin.gt.0) then
-!           print*,dustbin,' dust bins'
-!         endif
-!         print*,' 1 water vapour tracer'
-!         print*,' 1 water ice tracer'
-!         if (nq.gt.(dustbin+2)) then
-!           print*,'nq should be ',(dustbin+2),
-!     $            ' with these options...'
-!                  print*,'(or check callphys.def)'
-!         endif
-!         if (nq.lt.(dustbin+2)) then
-!           write(*,*) "inifis: nq.lt.(dustbin+2)"
-!           stop
-!         endif
-!       endif
-!
-!      endif ! of if (tracer)
-!
-!      RETURN
+      ! allocate "comsoil_h" arrays
+      call ini_comsoil_h(ngrid)
+            
+      ! set some variables in "dimradmars_mod"
+      call ini_dimradmars_mod(ngrid,nlayer)
+      
+      ! allocate arrays in "yomaer_h"
+      call ini_yomaer_h
+      
+      ! allocate arrays in "yomlw_h"
+      call ini_yomlw_h(ngrid)
+      
+      ! allocate arrays in "conc_mod"
+      call ini_conc_mod(ngrid,nlayer)
+      
       END