/[lmdze]/trunk/dyn3d/etat0.f90

Diff of /trunk/dyn3d/etat0.f90

Parent Directory | Revision Log | View Patch Patch

-trunk/dyn3d/etat0.f
revision 113 by guez,
Thu Sep 18 19:56:46 2014 UTC
+trunk/Sources/dyn3d/etat0.f
revision 156 by guez,
Thu Jul 16 17:39:10 2015 UTC
 Line 19 
 contains
      use caldyn0_m, only: caldyn0
      use comconst, only: cpp, kappa, iniconst
-     use comgeom, only: rlatu, rlonv, rlonu, rlatv, aire_2d, apoln, apols, &
+     use comgeom, only: aire_2d, apoln, apols, cu_2d, cv_2d, inigeom
-          cu_2d, cv_2d, inigeom
-     use conf_gcm_m, only: dayref, anneeref
      use dimens_m, only: iim, jjm, llm, nqmx
      use dimphy, only: zmasq
      use dimsoil, only: nsoilmx
      use disvert_m, only: ap, bp, preff, pa, disvert
+     use dynetat0_m, only: day_ref, annee_ref, xprimp025, xprimm025, rlatu1, &
+          rlatu2, rlatu, rlatv, yprimu1, yprimu2, rlonu, rlonv, xprimu, xprimv
      use dynredem0_m, only: dynredem0
      use dynredem1_m, only: dynredem1
      use exner_hyb_m, only: exner_hyb
+     use fxhyp_m, only: fxhyp
+     use fyhyp_m, only: fyhyp
      use geopot_m, only: geopot
      use grid_atob, only: grille_m
      use grid_change, only: init_dyn_phy, dyn_phy
-     use histclo_m, only: histclo
      use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
      use iniadvtrac_m, only: iniadvtrac
      use inifilr_m, only: inifilr
-Line 42 
 contains
+Line 43 
 contains
           nf95_inq_varid, nf95_open
      use nr_util, only: pi, assert
      use paramet_m, only: ip1jm, ip1jmp1
+     use phyetat0_m, only: rlat, rlon
      use phyredem_m, only: phyredem
      use q_sat_m, only: q_sat
      use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
-Line 50 
 contains
+Line 52 
 contains
      USE start_init_orog_m, only: start_init_orog, mask
      use start_init_phys_m, only: start_init_phys
      use start_inter_3d_m, only: start_inter_3d
-     use temps, only: itau_phy, annee_ref, day_ref
+     use temps, only: itau_phy
      use test_disvert_m, only: test_disvert
+     use unit_nml_m, only: unit_nml
      REAL, intent(out):: phis(:, :) ! (iim + 1, jjm + 1)
      ! surface geopotential, in m2 s-2
      ! Local:
-     REAL latfi(klon), lonfi(klon)
-     ! (latitude and longitude of a point of the scalar grid identified
-     ! by a simple index, in degrees)
      REAL, dimension(iim + 1, jjm + 1, llm):: ucov, t3d, teta
      REAL vcov(iim + 1, jjm, llm)
-Line 74 
 contains
+Line 73 
 contains
      REAL sn(klon)
      REAL qsolsrf(klon, nbsrf), snsrf(klon, nbsrf)
      REAL albe(klon, nbsrf), evap(klon, nbsrf)
-     REAL alblw(klon, nbsrf)
      REAL tsoil(klon, nsoilmx, nbsrf)
      REAL radsol(klon), rain_fall(klon), snow_fall(klon)
      REAL solsw(klon), sollw(klon), fder(klon)
-Line 122 
 contains
+Line 120 
 contains
      ! ("p3d(i, j, l)" is at longitude "rlonv(i)", latitude "rlatu(j)",
      ! for interface "l")
+     namelist /etat0_nml/ day_ref, annee_ref
      !---------------------------------
      print *, "Call sequence information: etat0"
+     print *, "Enter namelist 'etat0_nml'."
+     read(unit=*, nml=etat0_nml)
+     write(unit_nml, nml=etat0_nml)
      CALL iniconst
      ! Construct a grid:
-Line 133 
 contains
+Line 137 
 contains
      pa = 5e4
      CALL disvert
      call test_disvert
+     CALL fyhyp(rlatu, rlatv, rlatu2, yprimu2, rlatu1, yprimu1)
+     CALL fxhyp(xprimm025, rlonv, xprimv, rlonu, xprimu, xprimp025)
+     rlatu(1) = pi / 2.
+     rlatu(jjm + 1) = -rlatu(1)
      CALL inigeom
      CALL inifilr
-     latfi(1) = 90.
+     rlat(1) = 90.
-     latfi(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * 180. / pi
+     rlat(2:klon-1) = pack(spread(rlatu(2:jjm), 1, iim), .true.) * 180. / pi
      ! (with conversion to degrees)
-     latfi(klon) = - 90.
+     rlat(klon) = - 90.
-     lonfi(1) = 0.
+     rlon(1) = 0.
-     lonfi(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * 180. / pi
+     rlon(2:klon-1) = pack(spread(rlonv(:iim), 2, jjm - 1), .true.) * 180. / pi
      ! (with conversion to degrees)
-     lonfi(klon) = 0.
+     rlon(klon) = 0.
      call start_init_orog(phis, zmea_2d, zstd_2d, zsig_2d, zgam_2d, zthe_2d, &
           zpic_2d, zval_2d) ! also compute "mask"
-Line 304 
 contains
+Line 315 
 contains
      ! Initialisation pour traceurs:
      call iniadvtrac
      itau_phy = 0
-     day_ref = dayref
-     annee_ref = anneeref
      CALL geopot(teta, pk , pks, phis, phi)
      CALL caldyn0(ucov, vcov, teta, ps, masse, pk, phis, phi, w, pbaru, &
           pbarv)
-     CALL dynredem0("start.nc", dayref, phis)
+     CALL dynredem0("start.nc", day_ref, phis)
      CALL dynredem1("start.nc", vcov, ucov, teta, q, masse, ps, itau=0)
      ! Initialisations :
-Line 322 
 contains
+Line 331 
 contains
      albe(:, is_lic) = 0.6
      albe(:, is_oce) = 0.5
      albe(:, is_sic) = 0.6
-     alblw = albe
      evap = 0.
      qsolsrf = 150.
      tsoil = spread(spread(pack(tsol_2d, dyn_phy), 2, nsoilmx), 3, nbsrf)
-Line 347 
 contains
+Line 355 
 contains
      sig1 = 0.
      w01 = 0.
-     call phyredem("startphy.nc", latfi, lonfi, pctsrf, tsoil(:, 1, :), tsoil, &
+     call phyredem("startphy.nc", pctsrf, tsoil(:, 1, :), tsoil, &
           tsoil(:, 1, is_oce), seaice, qsolsrf, pack(qsol_2d, dyn_phy), snsrf, &
-          albe, alblw, evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, &
+          albe, evap, rain_fall, snow_fall, solsw, sollw, fder, radsol, frugs, &
-          frugs, agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, &
+          agesno, zmea, zstd, zsig, zgam, zthe, zpic, zval, t_ancien, &
           q_ancien, rnebcon, ratqs, clwcon, run_off_lic_0, sig1, w01)
-     CALL histclo
    END SUBROUTINE etat0

 Legend:



Removed from v.113
 


changed lines


 
Added in v.156
 Legend:



Removed from v.113
 


changed lines


 
Added in v.156
-Removed from v.113
+Added in v.156

	ViewVC Help
Powered by ViewVC 1.1.21