Changeset 5331


Ignore:
Timestamp:
2015-06-01T16:47:52+02:00 (5 years ago)
Author:
smasson
Message:

dev_r5218_CNRS17_coupling: bugfix in sas

Location:
branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90

    r5305 r5331  
    506506      ALLOCATE( snwice_mass(jpi,jpj)  , snwice_mass_b(jpi,jpj),             & 
    507507         &      snwice_fmass(jpi,jpj), STAT= ierr4 ) 
    508  
     508      ! 
     509      ! lim code currently uses surface temperature and salinity in tsn array for initialisation 
     510      ! and ub, vb arrays in ice dynamics 
     511      ! so allocate enough of arrays to use 
     512      ! 
    509513      jpm = MAX(jp_tem, jp_sal) 
    510514      ALLOCATE( tsn(jpi,jpj,1,jpm)  , STAT=ierr2 ) 
  • branches/2015/dev_r5218_CNRS17_coupling/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90

    r5215 r5331  
    265265      ENDIF 
    266266      ! 
    267       ! lim code currently uses surface temperature and salinity in tsn array for initialisation 
    268       ! and ub, vb arrays in ice dynamics 
    269       ! so allocate enough of arrays to use 
    270       ! 
    271       ierr3 = 0 
    272       jpm = MAX(jp_tem, jp_sal) 
    273       ALLOCATE( tsn(jpi,jpj,1,jpm), STAT=ierr0 ) 
    274       ALLOCATE( ub(jpi,jpj,1)     , STAT=ierr1 ) 
    275       ALLOCATE( vb(jpi,jpj,1)     , STAT=ierr2 ) 
    276       IF ( nn_ice == 1 ) ALLOCATE( tsb(jpi,jpj,1,jpm), STAT=ierr3 ) 
    277       ierr = ierr0 + ierr1 + ierr2 + ierr3 
    278       IF( ierr > 0 ) THEN 
    279          CALL ctl_stop('sbc_ssm_init: unable to allocate surface arrays') 
    280       ENDIF 
    281       ! 
    282267      ! finally tidy up 
    283268 
Note: See TracChangeset for help on using the changeset viewer.