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

Diff of /trunk/libf/dyn3d/etat0.f90

Parent Directory | Revision Log | View Patch Patch

-revision 18 by guez,
Thu Aug  7 12:29:13 2008 UTC
+revision 32 by guez,
Tue Apr  6 17:52:58 2010 UTC
 Line 19 
 contains
      ! This subroutine creates "mask".
-     USE ioipsl, only: flinget, flinclo, flinopen_nozoom, flininfo, histclo
+     use caldyn0_m, only: caldyn0
-     USE start_init_orog_m, only: start_init_orog, mask, phis
-     use start_init_phys_m, only: qsol_2d
-     use startdyn, only: start_inter_3d, start_init_dyn
-     use dimens_m, only: iim, jjm, llm, nqmx
-     use paramet_m, only: ip1jm, ip1jmp1
      use comconst, only: dtvr, daysec, cpp, kappa, pi
-     use comdissnew, only: lstardis, nitergdiv, nitergrot, niterh, &
-          tetagdiv, tetagrot, tetatemp
-     use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
-     use comvert, only: ap, bp, preff, pa
-     use dimphy, only: zmasq
-     use conf_gcm_m, only: day_step, iphysiq, dayref, anneeref
      use comgeom, only: rlatu, rlonv, rlonu, rlatv, aire_2d, apoln, apols, &
           cu_2d, cv_2d
-     use serre, only: alphax
+     use comvert, only: ap, bp, preff, pa
+     use conf_gcm_m, only: day_step, iphysiq, dayref, anneeref
+     use dimens_m, only: iim, jjm, llm, nqmx
+     use dimphy, only: zmasq
      use dimsoil, only: nsoilmx
-     use temps, only: itau_dyn, itau_phy, annee_ref, day_ref, dt
+     use dynredem0_m, only: dynredem0
+     use dynredem1_m, only: dynredem1
+     use exner_hyb_m, only: exner_hyb
      use grid_atob, only: grille_m
      use grid_change, only: init_dyn_phy, dyn_phy
-     use q_sat_m, only: q_sat
+     use indicesol, only: is_oce, is_sic, is_ter, is_lic, epsfra
-     use exner_hyb_m, only: exner_hyb
      use iniadvtrac_m, only: iniadvtrac
+     use inidissip_m, only: inidissip
+     use inigeom_m, only: inigeom
+     USE flincom, only: flinclo, flinopen_nozoom, flininfo
+     use flinget_m, only: flinget
+     use histcom, only: histclo
+     use paramet_m, only: ip1jm, ip1jmp1
+     use phyredem_m, only: phyredem
      use pressure_var, only: pls, p3d
-     use dynredem0_m, only: dynredem0
+     use q_sat_m, only: q_sat
      use regr_lat_time_coefoz_m, only: regr_lat_time_coefoz
      use regr_pr_o3_m, only: regr_pr_o3
-     use phyredem_m, only: phyredem
+     use serre, only: alphax
+     USE start_init_orog_m, only: start_init_orog, mask, phis
+     use start_init_phys_m, only: qsol_2d
+     use startdyn, only: start_inter_3d, start_init_dyn
+     use temps, only: itau_phy, annee_ref, day_ref
      ! Variables local to the procedure:
-Line 105 
 contains
+Line 108 
 contains
      REAL pbaru(ip1jmp1, llm), pbarv(ip1jm, llm)
      REAL w(ip1jmp1, llm)
      REAL phystep
+     real trash
      !---------------------------------
-Line 147 
 contains
+Line 151 
 contains
      PRINT *, "minval(pls(:, :, :)) = ", minval(pls(:, :, :))
      print *, "maxval(pls(:, :, :)) = ", maxval(pls(:, :, :))
-     uvent(:, :, :) = start_inter_3d('U', rlonv, rlatv, pls)
+     call start_inter_3d('U', rlonv, rlatv, pls, uvent)
      forall (l = 1: llm) uvent(:iim, :, l) = uvent(:iim, :, l) * cu_2d(:iim, :)
      uvent(iim+1, :, :) = uvent(1, :, :)
-     vvent(:, :, :) = start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :))
+     call start_inter_3d('V', rlonu, rlatu(:jjm), pls(:, :jjm, :), vvent)
      forall (l = 1: llm) vvent(:iim, :, l) = vvent(:iim, :, l) * cv_2d(:iim, :)
      vvent(iim + 1, :, :) = vvent(1, :, :)
-     t3d(:, :, :) = start_inter_3d('TEMP', rlonu, rlatv, pls)
+     call start_inter_3d('TEMP', rlonu, rlatv, pls, t3d)
      PRINT *,  'minval(t3d(:, :, :)) = ', minval(t3d(:, :, :))
      print *, "maxval(t3d(:, :, :)) = ", maxval(t3d(:, :, :))
-Line 174 
 contains
+Line 178 
 contains
      IF (MINVAL(qsat) == MAXVAL(qsat)) stop '"qsat" should not be constant'
      ! Water vapor:
-     q3d(:, :, :, 1) = 0.01 * start_inter_3d('R', rlonu, rlatv, pls) * qsat
+     call start_inter_3d('R', rlonu, rlatv, pls, q3d(:, :, :, 1))
+     q3d(:, :, :, 1) = 0.01 * q3d(:, :, :, 1) * qsat
      WHERE (q3d(:, :, :, 1) < 0.) q3d(:, :, :, 1) = 1E-10
      DO l = 1, llm
         q3d(:, 1, l, 1) = SUM(aire_2d(:, 1) * q3d(:, 1, l, 1)) / apoln
-Line 217 
 contains
+Line 222 
 contains
      ALLOCATE(dlon_lic(iml_lic))
      ALLOCATE(dlat_lic(jml_lic))
      ALLOCATE(fraclic(iml_lic, jml_lic))
-     CALL flinopen_nozoom("landiceref.nc", iml_lic, jml_lic, &
+     CALL flinopen_nozoom(iml_lic, jml_lic, &
-          llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, dt,  &
+          llm_tmp, lon_lic, lat_lic, lev, ttm_tmp, itaul, date, trash,  &
           fid)
      CALL flinget(fid, 'landice', iml_lic, jml_lic, llm_tmp, ttm_tmp &
           , 1, 1, fraclic)
-Line 288 
 contains
+Line 293 
 contains
      ! Initialisation pour traceurs:
      call iniadvtrac
-     ! Ecriture:
+     CALL inidissip
-     CALL inidissip(lstardis, nitergdiv, nitergrot, niterh, tetagdiv, &
-          tetagrot, tetatemp)
-     itau_dyn = 0
      itau_phy = 0
      day_ref = dayref
      annee_ref = anneeref
-     CALL geopot(ip1jmp1, tpot, pk , pks,  phis  , phi)
+     CALL geopot(ip1jmp1, tpot, pk , pks,  phis, phi)
-     CALL caldyn0(0, uvent, vvent, tpot, psol, masse, pk, phis, phi, w, &
+     CALL caldyn0(uvent, vvent, tpot, psol, masse, pk, phis, phi, w, pbaru, &
-          pbaru, pbarv, 0)
+          pbarv)
      CALL dynredem0("start.nc", dayref, phis)
-     CALL dynredem1("start.nc", 0., vvent, uvent, tpot, q3d, masse, psol)
+     CALL dynredem1("start.nc", vvent, uvent, tpot, q3d, masse, psol, itau=0)
      ! Ecriture �tat initial physique:
-     print *, 'dtvr = ', dtvr
      print *, "iphysiq = ", iphysiq
      phystep   = dtvr * REAL(iphysiq)
      print *, 'phystep = ', phystep

 Legend:



Removed from v.18
 


changed lines


 
Added in v.32
 Legend:



Removed from v.18
 


changed lines


 
Added in v.32
-Removed from v.18
+Added in v.32

	ViewVC Help
Powered by ViewVC 1.1.21