Changeset 2221 for trunk

Timestamp:

Jan 22, 2020, 12:36:03 PM (5 years ago)

Author:

emillour

Message:

Mars GCM:
Fix some conflicts that had not been resolved in previous commit.
EM

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (2 diffs)
• libf/phymars/callkeys.h (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -2807 +2807 @@
 Add the observer simulator program simu_MCS_temp.F90 to the LMDZ.MARS/util/ directory, as well as a simu_MCS_temp.def. This program reads a MCS file (binned by Luca Montabone), extracts the daytime and nighttime temperatures from a GCM simulation file, and outputs a netcdf file in the same format as the MCS file.
 More details in simu_MCS_temp.def and in the preface of simu_MCS_temp.F90.
-<<<<<<< .mine
-
-== 22/01/2020 == DB (the return!)
-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. 
-
-=======
 
 == 07/01/2020 == AD
@@ -2835 +2829 @@
 Change "latentheat" flag to a more descriptive "latentheat_surfwater" and
 set its default value to .true.
->>>>>>> .r2219
+
+== 22/01/2020 == DB (the return!)
+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. 
+

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
+     &   ,latentheat_surfwater,gwd_convective_source
      
       COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &