Changeset 2221 for trunk/LMDZ.MARS/libf


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r2220 r2221  
    1515     &   ,calltherm,callrichsl,callslope,tituscap,callyamada4,co2clouds &
    1616     &   ,co2useh2o,meteo_flux,CLFvaryingCO2,spantCO2,CLFvarying        &
    17 <<<<<<< .mine
    18      &   ,satindexco2,rdstorm,slpwind,calllott_nonoro,latentheat        &
    19      &   ,gwd_convective_source
    20 =======
    2117     &   ,satindexco2,rdstorm,slpwind,calllott_nonoro                   &
    22      &   ,latentheat_surfwater
    23 >>>>>>> .r2219
     18     &   ,latentheat_surfwater,gwd_convective_source
    2419     
    2520      COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &
Note: See TracChangeset for help on using the changeset viewer.