Changeset 8029


Ignore:
Timestamp:
2017-05-16T12:14:12+02:00 (3 years ago)
Author:
lovato
Message:

3.4 stable: apply macro selection as in 3.6_stable (#1528)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r8028 r8029  
    8888   REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ssh_bkg, ssh_bkginc   ! Background sea surface height and its increment 
    8989   REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   seaice_bkginc         ! Increment to the background sea ice conc 
    90 #if defined key_cice 
     90#if defined key_cice && defined key_asminc 
    9191   REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   ndaice_da             ! ice increment tendency into CICE 
    9292#endif 
     
    371371      ALLOCATE( ssh_iau(jpi,jpj)      ) 
    372372#endif 
    373 #if defined key_cice 
     373#if defined key_cice && defined key_asminc 
    374374      ALLOCATE( ndaice_da(jpi,jpj)      ) 
    375375#endif  
     
    383383      ssh_iau(:,:)    = 0.0 
    384384#endif 
    385 #if defined key_cice 
    386       ndaice_da(jpi,jpj) = 0.0 
     385#if defined key_cice && defined key_asminc 
     386      ndaice_da(:,:) = 0.0 
    387387#endif 
    388388      IF ( ( ln_trainc ).OR.( ln_dyninc ).OR.( ln_sshinc ).OR.( ln_seaiceinc ) ) THEN 
     
    10481048#endif 
    10491049 
    1050 #if defined key_cice 
     1050#if defined key_cice && defined key_asminc 
    10511051 
    10521052! Pass ice increment tendency into CICE 
     
    10611061         ELSE 
    10621062 
    1063 #if defined key_cice 
     1063#if defined key_cice && defined key_asminc 
    10641064 
    10651065! Zero ice increment tendency into CICE 
     
    11091109#endif 
    11101110 
    1111 #if defined key_cice 
     1111#if defined key_cice && defined key_asminc 
    11121112 
    11131113! Pass ice increment tendency into CICE - is this correct? 
     
    11211121         ELSE 
    11221122 
    1123 #if defined key_cice 
     1123#if defined key_cice && defined key_asminc 
    11241124 
    11251125! Zero ice increment tendency into CICE 
Note: See TracChangeset for help on using the changeset viewer.