Changeset 1263 for LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Timestamp:

Nov 17, 2009, 2:00:14 PM (15 years ago)

Author:

lguez

Message:

1) Reactivated ability to read ozone (that was deactivated because of
dependency on version of IOIPSL). Added ability to read a pressure
coordinate in Pa in "regr_lat_time_climoz".

2) Added the ability to read a second ozone climatology, corresponding to
daylight ozone:

-- "read_climoz" is now an integer variable, instead of a logical
variable.

-- Added argument "read_climoz" to "phys_state_var_init",
"phys_output_open" and "regr_lat_time_climoz".

-- Created new variable "ozone_daylight" for "hist*.nc" output files.

-- Added a third dimension to variable "wo" in module
"phys_state_var_mod" and variable "POZON" in "radlwsw": index 1 for
average day-night ozone, index 2 for daylight ozone.

-- Added a fourth dimension to variables "o3_in", "o3_regr_lat" and
"o3_out" in "regr_lat_time_climoz": index 1 for average day-night
ozone, index 2 for daylight ozone.

-- In "physiq", moved call to "conf_phys" before call to
"phys_state_var_init". Thus, "conf_phys" is now inside the block "if
(first)" instead of "IF (debut)". There were definitions of "bl95_b0"
and "bl95_b1" that were useless because the variables were overwritten
by "conf_phys". Removed those definitions.

-- In "radlwsw", we pass the average day-night ozone to "LW_LMDAR4"
and the daylight ozone, if we have it, to "SW_LMDAR4" or
"SW_AEROAR4". If we do not have a specific field for daylight ozone
then "SW_LMDAR4" or "SW_AEROAR4" just get the average day-night ozone.

-- "regr_lat_time_climoz" now manages latitudes where the input ozone
field is missing at all levels (polar night).

-- Encapsulated "radlwsw" in a module.

3) Modifications to make sequential and parallel versions of
"create_etat0_limit" almost identical:

-- In "dyn3dpar/create_etat0_limit.F". No need to call
"phys_state_var_init", removed "use phys_state_var_mod" statement. No
need for "clesphys.h", removed "include" statement.

-- In "dyn3dpar/etat0_netcdf.F". Added argument "tau_ratqs" in call to
"conf_phys" (this bug was already corrected in "dyn3d"). Moved call to
"inifilr" after call to "infotrac_init" (as in "dyn3d").

4) Other peripheral modifications:

-- Added procedures "nf95_get_att" and "nf95_def_var_scalar" in
NetCDF95 interface. Overloaded "nf95_put_var" with three more
procedures: "nf95_put_var_FourByteReal", "nf95_put_var_FourByteInt",
"nf95_put_var_1D_FourByteInt".

-- Overloaded "regr1_step_av" with one more procedure:
"regr14_step_av". Overloaded "regr3_lint" with one more procedure:
"regr34_lint".

-- Corrected call to "Init_Phys_lmdz" in "dyn3d/create_etat0_limit.F":
the last argument should be an array, not a scalar.

-- Encapsulated "conf_phys" in a module.

-- Splitted module "regr_pr" into "regr_pr_av_m" and "regr_pr_int_m".

5) Tests:

This revision was compared to revision 1259, with optimization options
"debug" and "dev", parallelization options "none", "mpi", "omp" and
"mpi_omp", 1 and 2 MPI processes, 1 and 2 OpenMP threads, with the
compiler "FORTRAN90/SX Version 2.0 for SX-8". Both programs
"create_etat0_limit" and "gcm" were tested. In all cases,
parallelization does not change the results. With "read_climoz = 0" in
the ".def" files, the results of revision 1259 and of this revision
are the same.

Location:

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar

Files:

• create_etat0_limit.F (modified) (3 diffs)
• etat0_netcdf.F (modified) (6 diffs)

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/create_etat0_limit.F

@@ -9 +9 @@
        USE mod_phys_lmdz_para
        USE mod_const_mpi
-       USE phys_state_var_mod      
        USE infotrac
 #ifdef CPP_IOIPSL
@@ -38 +37 @@
 #include "indicesol.h"
 #include  "control.h"
-#include "clesphys.h"
       REAL :: masque(iip1,jjp1)
 !      REAL :: pctsrf(iim*(jjm-1)+2, nbsrf)
@@ -62 +60 @@
      &                 for 1 process and 1 task')
       ENDIF
-      CALL phys_state_var_init
       call InitComgeomphy
-      
+
 #ifdef CPP_IOIPSL
       call ioconf_calendar('360d')

LMDZ4/branches/LMDZ4-dev/libf/dyn3dpar/etat0_netcdf.F

@@ -15 +15 @@
       USE filtreg_mod
       use regr_lat_time_climoz_m, only: regr_lat_time_climoz
+      use conf_phys_m, only: conf_phys
 #endif
 !#endif of #ifdef CPP_EARTH
@@ -132 +133 @@
       REAL                 :: bl95_b0, bl95_b1
       real                 :: fact_cldcon, facttemps,ratqsbas,ratqshaut
+      real                 :: tau_ratqs
       integer              :: iflag_cldcon
       integer              :: iflag_ratqs
@@ -142 +144 @@
       REAL      :: solarlong0
       real :: seuil_inversion
-      logical  read_climoz ! read ozone climatology
+
+      integer  read_climoz ! read ozone climatology
+C     Allowed values are 0, 1 and 2
+C     0: do not read an ozone climatology
+C     1: read a single ozone climatology that will be used day and night
+C     2: read two ozone climatologies, the average day and night
+C     climatology and the daylight climatology
 
       !
@@ -170 +178 @@
      &                 fact_cldcon, facttemps,ok_newmicro,iflag_radia,  &
      &                 iflag_cldcon,                                    &
-     &                 iflag_ratqs,ratqsbas,ratqshaut,                  &
+     &                 iflag_ratqs,ratqsbas,ratqshaut,tau_ratqs,        &
      &                 ok_ade, ok_aie, aerosol_couple,                  &
      &                 flag_aerosol, new_aod,                           &
@@ -187 +195 @@
       CALL inigeom()
 
-      CALL inifilr()
 ! Initialisation pour traceurs
       call infotrac_init
       ALLOCATE(q3d(iip1, jjp1, llm, nqtot))
-!     CALL phys_state_var_init()
+
+      CALL inifilr()
+      CALL phys_state_var_init(read_climoz)
       !
       latfi(1) = ASIN(1.0)
@@ -416 +425 @@
       !
 
-      if (read_climoz) call regr_lat_time_climoz ! ozone climatology
+!     Ozone climatology:
+      if (read_climoz >= 1) call regr_lat_time_climoz(read_climoz)
 
       varname = 'tsol'