Changeset 1650 for trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90

Timestamp:

Jan 25, 2017, 4:02:54 PM (8 years ago)

Author:

emillour

Message:

Dynamical core: Further adaptations to stick with LMDZ5 (up to rev r2750)

• libf
• makelmdz[_fcm] : added Earth-specific "dust" and "strataer" cases and

-arch_path option

• bld.cfg : added dust and strataer cases

• dyn3d[par]
• conf_gcm.F90 : added read_orop parameter (Earth-related) for

loading subgrid orography parameters.

• guide[_p]_mod.F90: added output of nudging coefficients for winds

and temperature

• temps_mod.F90 : cosmetics/comments
• logic_mod.F90 : cosmetics/comments

• dyn3d_common
• comconst_mod.F90 : cosmetics/comments + added year_day module variable
• conf_planete.F90 : added year_day from comconst_mod as done in LMDZ5
• comvert_mod.F90 : cosmetics/comments
• infotrac.F90 : added "startAer" case to follow up with LMDZ5

• misc
• wxios.F90 : follow up on changes in LMDZ5

EM

File:

• trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90 (modified) (5 diffs)

trunk/LMDZ.COMMON/libf/dyn3d/conf_gcm.F90

@@ -25 +25 @@
   USE logic_mod, ONLY: tidal,purmats,ok_guide,read_start,iflag_phys,            &
                 iflag_trac,ok_strato,ok_gradsfile,ok_limit,ok_etat0,            &
-                moyzon_mu,moyzon_ch,ok_strato,fxyhypb,ysinus
+                moyzon_mu,moyzon_ch,ok_strato,fxyhypb,ysinus,read_orop
   USE serre_mod, ONLY: clon,clat,grossismx,grossismy,dzoomx,dzoomy,             &
                 alphax,alphay,taux,tauy
@@ -53 +53 @@
 !   ------
 
-  CHARACTER ch1*72,ch2*72,ch3*72,ch4*12
   REAL clonn,clatt,grossismxx,grossismyy
   REAL dzoomxx,dzoomyy, tauxx,tauyy
   LOGICAL  fxyhypbb, ysinuss
-  INTEGER i
   LOGICAL use_filtre_fft
 !
@@ -549 +547 @@
   IF (use_filtre_fft) THEN
     write(lunout,*)'STOP !!!'
-    write(lunout,*)'use_filtre_fft n est pas implemente dans dyn3d'
+    write(lunout,*)'use_filtre_fft not implemented in dyn3d'
     STOP 1
   ENDIF
@@ -597 +595 @@
   ok_etat0 = .TRUE.
   CALL getin('ok_etat0',ok_etat0)
+
+!Config  Key  = read_orop
+!Config  Desc = lecture du fichier de params orographiques sous maille
+!Config  Def  = f
+!Config  Help = lecture fichier plutot que grid_noro
+
+  read_orop = .FALSE.
+  CALL getin('read_orop',read_orop)
 
 !----------------------------------------
@@ -954 +960 @@
  write(lunout,*)' ok_limit = ', ok_limit
  write(lunout,*)' ok_etat0 = ', ok_etat0
+ write(lunout,*)' read_orop = ', read_orop
  if (planet_type=="titan") then
    write(lunout,*)' moyzon_mu = ', moyzon_mu