Changeset 1252

Timestamp:

May 11, 2014, 7:41:54 PM (11 years ago)

Author:

aslmd

Message:

LMDZ.GENERIC LMDZ.COMMON LMDZ.UNIVERSAL. Bye Bye LMDZ.UNIVERSAL. Go to LMDZ.COMMON!

Location:

trunk

Files:

• LMDZ.COMMON/deftank (added)
• LMDZ.COMMON/deftank/def_generic_giants (copied) (copied from trunk/LMDZ.UNIVERSAL/deftank)
• LMDZ.COMMON/deftank/def_generic_giants/PROTO_Saturn_Article/modif.128x96.def (modified) (1 diff)
• LMDZ.COMMON/deftank/def_generic_giants/PROTO_Saturn_Article/run.def (modified) (7 diffs)
• LMDZ.COMMON/deftank/def_generic_giants/README.aymeric (copied) (copied from trunk/LMDZ.UNIVERSAL/README.aymeric)
• LMDZ.COMMON/deftank/def_generic_giants/launch.gnome.64x48x64 (added)
• LMDZ.GENERIC/libf/phystd/dimphys.h (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/inifis.F (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/newstart.F (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/phyetat0.F90 (modified) (1 diff)
• LMDZ.GENERIC/libf/phystd/physiq.F90 (modified) (3 diffs)
• LMDZ.GENERIC/libf/phystd/start2archive.F (modified) (1 diff)
• LMDZ.UNIVERSAL (deleted)

trunk/LMDZ.COMMON/deftank/def_generic_giants/PROTO_Saturn_Article/modif.128x96.def ¶

@@ -2 +2 @@
 ## RUN.DEF
 
-# nombre de pas par jour (multiple de iperiod) ( ici pour dt = 1 min )
- day_step = 140
+day_step = 140
+day_step = 280
 
-# periode de la physique (en pas) (en pas dynamiques, n'a de sens que si iflag_phys=1)                                      
-  iphysiq=7
+# peu d appel physiq
+iphysiq = 140
 
-# temps de dissipation des plus petites long.d ondes pour u,v (gradiv)  
- tetagdiv=2700.
+tetagdiv = 2700.
+tetagrot = 3600.
+tetatemp = 3600.
 
-# temps de dissipation des plus petites long.d ondes pour u,v(nxgradrot)
- tetagrot=3600.
-
-# temps de dissipation des plus petites long.d ondes pour  h ( divgrad) 
- tetatemp=3600.
+#tetagdiv = 1500.
+#tetagrot = 2400.
+#tetatemp = 2400.
 
 ## CALLPHYS.DEF
 
-# the rad. transfer is computed every "iradia" physical timestep
-iradia     = 320
+## peu d appel physiq
+#iradia = 320

trunk/LMDZ.COMMON/deftank/def_generic_giants/PROTO_Saturn_Article/run.def ¶

@@ -18 +18 @@
 ### use_filtre_fft --> flag to activate FFT filtering
 ###########################################################################
-nday = 65000
+nday = 650000
+nday = 1250
 iperiod = 5
 day_step = 70
@@ -39 +40 @@
 ### physic --> flag with or without physics (*)
 ###########################################################################
-iphysiq = 14
+iphysiq = 140
 ecritphy = 7000
 planet_type = generic
@@ -60 +61 @@
 read_start = y 
 raz_date = 0
-ok_guide = n
+ok_guide = y
 facwind = 1.e6
 
@@ -82 +83 @@
 ###########################################################################
 dissip_period = 5
-dissip_fac_mid = 1.
+dissip_fac_mid = 2
 lstardis = .true. 
 nitergdiv = 1
 nitergrot = 2
 niterh = 2
-tetagdiv = 5400. 8000. 160000. 1000. 2500. 4000.
-tetagrot = 7200. 8000. 160000. 1000. 2500. 4000.
-tetatemp = 7200. 8000. 160000. 1000. 2500. 4000.
+tetagdiv = 5400.
+tetagrot = 7200.
+tetatemp = 7200.
 
 ###########################################################################
@@ -100 +101 @@
 ### - dissip_pupstart --> pressure at bottom of transition region (Pa) 
 ###########################################################################
-ok_strato = n
-dissip_fac_up = 5
+ok_strato = y
+dissip_fac_up = 2
 dissip_deltaz = 150.
 dissip_hdelta = 50.
@@ -119 +120 @@
 ### e-5 medium / e-4 strong yet reasonable / e-3 very strong
 ###########################################################################
-iflag_top_bound = 1
+iflag_top_bound = 2
 mode_top_bound = 1
+tau_top_bound = 1.e-5
+tau_top_bound = 1.e-6
 tau_top_bound = 1.e-4
 
@@ -189 +192 @@
 ###########################################################################
 INCLUDEDEF=callphys.def
-#INCLUDEDEF=modif.def
+INCLUDEDEF=modif.def

trunk/LMDZ.GENERIC/libf/phystd/dimphys.h ¶

@@ -13 +13 @@
 !-----------------------------------------------------------------------
 
-      common/dimphys/cursor
-      integer cursor  !! this is the position of point 1 on the globe
-                      !! it is 1 obviously for sequential runs
-                      !! but might differ for paraller runs
-                      !! it is used in phyetat0 mostly
-

trunk/LMDZ.GENERIC/libf/phystd/inifis.F ¶

@@ -86 +86 @@
 
       avocado = 6.02214179e23   ! added by RW
-
-      cursor = 1 ! added by AS in dimphys. 1 for sequential runs.
 
 ! --------------------------------------------------------

trunk/LMDZ.GENERIC/libf/phystd/newstart.F ¶

@@ -284 +284 @@
       IF (.not. ALLOCATED(long)) ALLOCATE(long(ngridmx))
       IF (.not. ALLOCATED(area)) ALLOCATE(area(ngridmx))
-      cursor = 1 ! added by AS in dimphys. 1 for sequential runs.
 
 c-----------------------------------------------------------------------

trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90 ¶

@@ -77 +77 @@
       INTEGER :: indextime=1 ! index of selected time, default value=1
       logical :: found
-
-!! added variables by AS to allow to read only slices of startfi
-!      real :: toto(ngrid)
-!      integer :: sta   !! subscript in starti where we start to read
-!      integer, dimension(2) :: sta2d
-!      integer, dimension(2) :: siz2d
-
-! AS: get the cursor that is stored in dimphys.h
-! ... this allows to read only a part of startfi horiz grid
-!sta = cursor
 
 !

trunk/LMDZ.GENERIC/libf/phystd/physiq.F90 ¶

@@ -730 +730 @@
               ztim1=SIN(declin)
 !              ztim2=COS(declin)*COS(2.*pi*(zday/year_day) - zls*nres)
-!              ztim3=-COS(declin)*SIN(2.  zday/year_day) - zls*nres)
+!              ztim3=-COS(declin)*SIN(2.*pi*(zday/year_day) - zls*nres)
 ! JL12 corrects tidally resonant cases. nres=omega_rot/omega_orb
               ztim2=COS(declin)*COS(2.*pi*(zday/year_day)*nres - zls)
@@ -1493 +1493 @@
       if(callsoil)then
          TsS = SUM(area(:)*tsoil(:,nsoilmx))/totarea        ! mean temperature at bottom soil layer
-         if (cursor == 1) then
            print*,'  ave[Tsurf]     min[Tsurf]     max[Tsurf]     ave[Tdeep]'
            print*,Ts1,Ts2,Ts3,TsS
-         endif
       else
-         if (cursor == 1) then
            print*,'  ave[Tsurf]     min[Tsurf]     max[Tsurf]'
            print*,Ts1,Ts2,Ts3
-         endif         
       end if
 
@@ -1647 +1643 @@
 
 
-         if (cursor == 1) then
            print*,'--> Ls =',zls*180./pi
-         endif
 !        -------------------------------------------------------------------
 !        Writing NetCDF file  "RESTARTFI" at the end of the run

trunk/LMDZ.GENERIC/libf/phystd/start2archive.F ¶

@@ -128 +128 @@
       CALL defrun_new(99, .TRUE. )
       grireg   = .TRUE.
-      cursor = 1 ! added by AS in dimphys.
 
 ! initialize "serial/parallel" related stuff