Changeset 2716 for LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

Timestamp:

Nov 28, 2016, 11:01:20 PM (8 years ago)

Author:

fhourdin

Message:

Inclusion du cas arm_cu2, avec les nouveaux formats de forçage 1D
(Marie-Pierre Lefebvre)

File:

• LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90 (modified) (10 diffs)

LMDZ5/trunk/libf/phylmd/dyn1d/lmdz1d.F90

@@ -32 +32 @@
    USE indice_sol_mod
    USE phyaqua_mod
-   USE mod_1D_cases_read
+!  USE mod_1D_cases_read
+   USE mod_1D_cases_read2
    USE mod_1D_amma_read
    USE print_control_mod, ONLY: lunout, prt_level
@@ -140 +141 @@
         logical :: forcing_fire    = .false.
         logical :: forcing_case    = .false.
+        logical :: forcing_case2   = .false.
         integer :: type_ts_forcing ! 0 = SST constant; 1 = SST read from a file
 !                                                            (cf read_tsurf1d.F)
@@ -192 +194 @@
       real :: du_phys(llm),dv_phys(llm),dt_phys(llm)
       real :: dt_dyn(llm)
-      real :: dt_cooling(llm),d_th_adv(llm),d_t_nudge(llm)
+      real :: dt_cooling(llm),d_t_adv(llm),d_th_adv(llm),d_t_nudge(llm)
       real :: d_u_nudge(llm),d_v_nudge(llm)
       real :: du_adv(llm),dv_adv(llm)
@@ -332 +334 @@
 !             101=cindynamo
 !             102=bomex
+!forcing_type >= 100 ==> forcing_case2 = .true.
+!             temporary flag while all the 1D cases are not whith the same cas.nc forcing file
+!             103=arm_cu2 ie arm_cu with new forcing format
+!             104=rico2 ie rico with new forcing format
 !forcing_type = 40 ==> forcing_GCSSold = .true.
 !             initial profile from GCSS file
@@ -384 +390 @@
        heure_ini_cas=0.
        pdt_cas=1800.         ! forcing frequency
+      elseif (forcing_type .eq.103) THEN ! Arm_cu starts 21-6-1997 11h30
+       forcing_case2 = .true.
+       year_ini_cas=1997
+       mth_ini_cas=6
+       day_deb=21
+       heure_ini_cas=11.5
+       pdt_cas=1800.         ! forcing frequency
+      elseif (forcing_type .eq.104) THEN ! rico starts 16-12-2004 0h
+       forcing_case2 = .true.
+       year_ini_cas=2004
+       mth_ini_cas=12
+       day_deb=16
+       heure_ini_cas=0.
+       pdt_cas=1800.         ! forcing frequency
       elseif (forcing_type .eq.40) THEN
        forcing_GCSSold = .true.
@@ -456 +476 @@
       endif
       print *,'fnday=',fnday
-
+!     start_time doit etre en FRACTION DE JOUR
       start_time=time_ini/24.
 
 ! Special case for arm_cu which lasts less than one day : 53100s !! (MPL 20111026)
       IF(forcing_type .EQ. 61) fnday=53100./86400.
+      IF(forcing_type .EQ. 103) fnday=53100./86400.
 ! Special case for amma which lasts less than one day : 64800s !! (MPL 20120216)
       IF(forcing_type .EQ. 6) fnday=64800./86400.
@@ -505 +526 @@
       print*,'time case',year_ini_cas,mth_ini_cas,day_ini_cas
       call ymds2ju                                                         &
-     & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas              &
+     & (year_ini_cas,mth_ini_cas,day_ini_cas,heure_ini_cas*3600            &
      & ,day_ju_ini_cas)
       print*,'time case 2',day_ini_cas,day_ju_ini_cas
@@ -527 +548 @@
       ENDIF
 
+      IF (forcing_type .gt.100) THEN
+      daytime = day + heure_ini_cas/24. ! 1st day and initial time of the simulation 
+      ELSE
       daytime = day + time_ini/24. ! 1st day and initial time of the simulation 
+      ENDIF
 ! Print out the actual date of the beginning of the simulation :
       call ju2ymds(daytime,year_print, month_print,day_print,sec_print)
@@ -1034 +1059 @@
 
        if (forcing_toga .or. forcing_GCSSold .or. forcing_twpice            &
-     &    .or.forcing_amma) then
+     &    .or.forcing_amma .or. forcing_type.eq.101) then
          fcoriolis=0.0 ; ug=0. ; vg=0.
        endif
-         if(forcing_rico) then
+
+       if(forcing_rico) then
           dt_cooling=0.
-        endif
+       endif
 
       IF (prt_level >= 5) print*, 'fcoriolis, xlat,mxcalc ', &
@@ -1201 +1227 @@
 !#endif
 
+