Changeset 7078 for branches

Timestamp:

2016-10-24T18:28:34+02:00 (8 years ago)

Author:

emanuelaclementi

Message:

#1643 Updates on development branch 2015/dev_r5936_INGV1_WAVE

Location:

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) (3 diffs)

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -1246 +1246 @@
    sn_wmp      =  'sdw_wave' ,        1          , 'wmp'        ,     .true.   , .false. , 'daily'   ,  ''      , ''       , ''
    sn_wnum     =  'sdw_wave' ,        1          , 'wave_num'   ,     .true.   , .false. , 'daily'   ,  ''      , ''       , ''
-   sn_tauoc    -  'sdw_wave' ,        1          , 'wave_stress',     .true.   , .false. , 'daily'   ,  ''      , ''       , ''
+   sn_tauoc    =  'sdw_wave' ,        1          , 'wave_stress',     .true.   , .false. , 'daily'   ,  ''      , ''       , ''
 !
    cn_dir  = './'  !  root directory for the location of drag coefficient files

branches/2015/dev_r5936_INGV1_WAVE/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

@@ -44 +44 @@
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: tsd2d
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: usd2d, vsd2d
-   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:,:)     :: usd3d, vsd3d, wsd3d 
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)     :: usd3d, vsd3d, wsd3d 
    REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:)       :: zusd2dt, zvsd2dt
 
@@ -118 +118 @@
             !
                                    ALLOCATE( sf_tauoc(1)%fnow(jpi,jpj,1)   )
-            IF( sn_cdg%ln_tint )   ALLOCATE( sf_tauoc(1)%fdta(jpi,jpj,1,2) )
+            IF( sn_tauoc%ln_tint )   ALLOCATE( sf_tauoc(1)%fdta(jpi,jpj,1,2) )
             CALL fld_fill( sf_tauoc, (/ sn_tauoc /), cn_dir, 'sbc_wave', 'Wave module', 'namsbc_wave' )
             ALLOCATE( tauoc_wave(jpi,jpj) )
@@ -139 +139 @@
             ALLOCATE( usd3d(jpi,jpj,jpk),vsd3d(jpi,jpj,jpk),wsd3d(jpi,jpj,jpk) )
             ALLOCATE( swh(jpi,jpj), wmp(jpi,jpj) )
+            ALLOCATE( zusd2dt(jpi,jpj), zvsd2dt(jpi,jpj) )
             usd3d(:,:,:) = 0._wp   ;   usd2d(:,:) = 0._wp   ;   
             vsd3d(:,:,:) = 0._wp   ;   vsd2d(:,:) = 0._wp   ;