Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/lmdz1d.F90

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/lmdz1d.F90 (modified) (9 diffs)

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

@@ -21 +21 @@
       USE indice_sol_mod
       USE phyaqua_mod
+      USE mod_1D_cases_read
 
       implicit none
@@ -111 +112 @@
         logical :: forcing_twpice  = .false.
         logical :: forcing_amma    = .false.
+        logical :: forcing_dice    = .false.
         logical :: forcing_GCM2SCM = .false.
         logical :: forcing_GCSSold = .false.
@@ -177 +179 @@
 !---------------------------------------------------------------------
       logical :: ok_writedem =.true.
+      real :: sollw_in = 0.
+      real :: solsw_in = 0.
       
 !---------------------------------------------------------------------
@@ -261 +265 @@
 !             initial profiles from AMMA nc file 
 !             LS convergence, omega and surface fluxes imposed from AMMA file  
+!forcing_type = 7 ==> forcing_dice = .true.
+!             initial profiles and large scale forcings in dice_driver.nc
+!             Different stages: soil model alone, atm. model alone
+!             then both models coupled
 !forcing_type = 40 ==> forcing_GCSSold = .true.
 !             initial profile from GCSS file
@@ -295 +303 @@
       elseif (forcing_type .eq.6) THEN
        forcing_amma = .true.
+      elseif (forcing_type .eq.7) THEN
+       forcing_dice = .true.
       elseif (forcing_type .eq.40) THEN
        forcing_GCSSold = .true.
@@ -318 +328 @@
 
         type_ts_forcing = 0
-        if (forcing_toga.or.forcing_sandu.or.forcing_astex)                 &
+        if (forcing_toga.or.forcing_sandu.or.forcing_astex .or. forcing_dice)                 &
      &    type_ts_forcing = 1
 
@@ -365 +375 @@
 ! Special case for amma which lasts less than one day : 64800s !! (MPL 20120216)
       IF(forcing_type .EQ. 6) fnday=64800./86400.
+!     IF(forcing_type .EQ. 6) fnday=50400./86400.
       annee_ref = anneeref
       mois = 1
@@ -390 +401 @@
      & (year_ini_amma,mth_ini_amma,day_ini_amma,heure_ini_amma              &
      & ,day_ju_ini_amma)
-
+      ELSEIF (forcing_type .eq.7) THEN
+! Convert the initial date of DICE to Julian day
+      call ymds2ju                                                         &
+     & (year_ini_dice,mth_ini_dice,day_ini_dice,heure_ini_dice             & 
+     & ,day_ju_ini_dice)
       ELSEIF (forcing_type .eq.59) THEN
 ! Convert the initial date of Sandu case to Julian day
@@ -404 +419 @@
 
       ELSEIF (forcing_type .eq.61) THEN
-
 ! Convert the initial date of Arm_cu case to Julian day
       call ymds2ju                                                          &