Changeset 2220 for trunk/LMDZ.MARS/libf/phymars/callkeys.h

Timestamp:

Jan 22, 2020, 11:41:33 AM (5 years ago)

Author:

dbardet

Message:

Update the nonorographic gravity waves drag parametrization (from the r3599 of Earth s model LMDZ6): 1) add east_ and west_gwdstress variables, 2) delete aleas function: random waves are producted by the MOD function, 3) reproductibility concerning the number of procs is now validated, 4) changing name of some variables like RUW, RVW, ZOP, ZOM,..., 5) tendency of winds due to GW drag are now module variables and written in restart files.

File:

• trunk/LMDZ.MARS/libf/phymars/callkeys.h (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/callkeys.h

@@ -15 +15 @@
      &   ,calltherm,callrichsl,callslope,tituscap,callyamada4,co2clouds &
      &   ,co2useh2o,meteo_flux,CLFvaryingCO2,spantCO2,CLFvarying        &
+<<<<<<< .mine
+     &   ,satindexco2,rdstorm,slpwind,calllott_nonoro,latentheat        &
+     &   ,gwd_convective_source
+=======
      &   ,satindexco2,rdstorm,slpwind,calllott_nonoro                   &
      &   ,latentheat_surfwater
+>>>>>>> .r2219
      
       COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &
@@ -37 +42 @@
       logical callg2d
       logical linear
+      logical gwd_convective_source
 
       real topdustref