Changeset 2310 for LMDZ5/trunk/libf/phylmd/dyn1d

Timestamp:

Jun 24, 2015, 12:04:31 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Modifications for 1d model
MPL

Location:

LMDZ5/trunk/libf/phylmd/dyn1d

Files:

• 1D_interp_cases.h (modified) (1 prop)
• 1D_read_forc_cases.h (modified) (1 prop)
• 1Dconv.h (modified) (1 diff, 1 prop)
• mod_1D_amma_read.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_1D_amma_read.F90)
• mod_1D_cases_read.F90 (moved) (moved from LMDZ5/trunk/libf/phylmd/mod_1D_cases_read.F90) (1 diff, 1 prop)

LMDZ5/trunk/libf/phylmd/dyn1d/1Dconv.h

@@ +1 @@
+!
+! $Id$
+!
         subroutine get_uvd(itap,dtime,file_forctl,file_fordat,                  &
      &       ht,hq,hw,hu,hv,hthturb,hqturb,                                     &

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

@@ -948 +948 @@
         print*,'Check time',day1,day_ini_cas,day_ini_cas+1
 
-        if ((forcing_type.eq.10).and.(1.eq.1)) then
-! Check that initial day of the simulation consistent with the case:
-       if (annee_ref.ne.1969) then
-!       print*,'Pour CINDY, annee_ref doit etre 2011'
-        print*,'Pour BOMEX, annee_ref doit etre 1969'
-        print*,'Changer annee_ref dans run.def'
-        stop
-       endif
-       if (annee_ref.eq.1969 .and. day1.lt.day_ini_cas) then
-!       print*,'CINDY a debute le 1 octobre 2011',day1,day_ini_cas
-        print*,'BOMEX a debute le 24 juin 1969',day1,day_ini_cas
-        print*,'Changer dayref dans run.def'
-        stop
-       endif
-       if (annee_ref.eq.1969 .and. day1.gt.day_ini_cas+1) then
-!       print*,'CINDY a fini le 31 decembre'
-        print*,'BOMEX a fini le 24 juin'
-        print*,'Changer dayref ou nday dans run.def',day1,day_ini_cas+90
-        stop
-       endif
-       endif
-!CR:ATTENTION TEST AMMA
+! On teste si la date du cas AMMA est correcte.
+! C est pour memoire car en fait les fichiers .def
+! sont censes etre corrects.
+! A supprimer a terme (MPL 20150623)
       if ((forcing_type.eq.10).and.(1.eq.0)) then
 ! Check that initial day of the simulation consistent with AMMA case: