Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/phyaqua_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phyaqua_mod.F90 (modified) (8 diffs)

LMDZ5/branches/testing/libf/phylmd/phyaqua_mod.F90

@@ -5 +5 @@
 CONTAINS
 
-  SUBROUTINE iniaqua(nlon, latfi, lonfi, iflag_phys)
+  SUBROUTINE iniaqua(nlon, iflag_phys)
 
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -19 +19 @@
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
-    USE comgeomphy, ONLY: rlatd, rlond
     USE dimphy, ONLY: klon
+    USE geometry_mod, ONLY : latitude
     USE surface_data, ONLY: type_ocean, ok_veget
     USE pbl_surface_mod, ONLY: pbl_surface_init
     USE fonte_neige_mod, ONLY: fonte_neige_init
     USE phys_state_var_mod
-    USE control_mod, ONLY: dayref, nday, iphysiq
+    USE time_phylmdz_mod, ONLY: day_ref, ndays, pdtphys, &
+                                day_ini,day_end
     USE indice_sol_mod
-
+    USE nrtype, ONLY: pi
     USE ioipsl
     IMPLICIT NONE
 
-    include "dimensions.h"
-    ! #include "dimphy.h"
-    ! #include "YOMCST.h"
-    include "comconst.h"
+    include "YOMCST.h"
     include "clesphys.h"
     include "dimsoil.h"
-    include "temps.h"
 
     INTEGER, INTENT (IN) :: nlon, iflag_phys
     ! IM ajout latfi, lonfi
-    REAL, INTENT (IN) :: lonfi(nlon), latfi(nlon)
+!    REAL, INTENT (IN) :: lonfi(nlon), latfi(nlon)
 
     INTEGER type_profil, type_aqua
@@ -120 +117 @@
     INTEGER l, ierr, aslun
 
-    REAL longitude, latitude
+!    REAL longitude, latitude
     REAL paire
 
-    DATA latitude, longitude/48., 0./
+!    DATA latitude, longitude/48., 0./
 
     ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -152 +149 @@
 
     ! IM ajout latfi, lonfi
-    rlatd = latfi
-    rlond = lonfi
-    rlat = rlatd*180./pi
-    rlon = rlond*180./pi
+!    rlatd = latfi
+!    rlond = lonfi
+!    rlat = rlatd*180./pi
+!    rlon = rlond*180./pi
 
     ! -----------------------------------------------------------------------
@@ -161 +158 @@
     ! -----------------------------------------------------------------------
 
-    day_ini = dayref
-    day_end = day_ini + nday
-    airefi = 1.
-    zcufi = 1.
-    zcvfi = 1.
+    day_ini = day_ref
+    day_end = day_ini + ndays
+!    airefi = 1.
+!    zcufi = 1.
+!    zcvfi = 1.
     !$OMP MASTER
     nbapp_rad_omp = 24
@@ -263 +260 @@
     END DO
     ! IM calcul profil sst
-    CALL profil_sst(nlon, rlatd, type_profil, phy_sst)
+    CALL profil_sst(nlon, latitude, type_profil, phy_sst)
 
     CALL writelim(klon, phy_nat, phy_alb, phy_sst, phy_bil, phy_rug, phy_ice, &
@@ -276 +273 @@
     ! Ecriture etat initial physique
 
-    timestep = dtvr*float(iphysiq)
-    radpas = nint(daysec/timestep/float(nbapp_rad))
+    timestep = pdtphys
+    radpas = nint(rday/timestep/float(nbapp_rad))
 
     DO i = 1, longcles
@@ -492 +489 @@
     USE mod_phys_lmdz_transfert_para, ONLY: gather
     IMPLICIT NONE
-    ! #include "dimensions.h"
-    ! #include "dimphy.h"
     include "netcdf.inc"