Changeset 5942 for branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2015-11-27T17:35:41+01:00 (9 years ago)

Author:

rfurner

Message:

merged bug fixes from vn3.6_stable to this branch

Location:

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/LIM_SRC_3

Files:

• limistate.F90 (modified) (1 diff)
• limrhg.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -117 +117 @@
 
       ! basal temperature (considered at freezing point)
-      t_bo(:,:) = ( eos_fzp( sss_m(:,:) ) + rt0 ) * tmask(:,:,1) 
+      CALL eos_fzp( sss_m(:,:), t_bo(:,:) )
+      t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) 
 
       IF( ln_iceini ) THEN

branches/UKMO/dev_r5518_Surge_Modelling/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90

@@ -159 +159 @@
       CALL wrk_alloc( jpi,jpj, u_oce2, u_ice2, v_oce1 , v_ice1 , zmask               )
       CALL wrk_alloc( jpi,jpj, zf1   , zu_ice, zf2   , zv_ice , zdt    , zds  )
-      CALL wrk_alloc( jpi,jpj, zdt   , zds   , zs1   , zs2   , zs12   , zresr , zpice                 )
+      CALL wrk_alloc( jpi,jpj, zs1   , zs2   , zs12   , zresr , zpice                 )
 
 #if  defined key_lim2 && ! defined key_lim2_vp
@@ -690 +690 @@
       CALL wrk_dealloc( jpi,jpj, u_oce2, u_ice2, v_oce1 , v_ice1 , zmask               )
       CALL wrk_dealloc( jpi,jpj, zf1   , zu_ice, zf2   , zv_ice , zdt    , zds  )
-      CALL wrk_dealloc( jpi,jpj, zdt   , zds   , zs1   , zs2   , zs12   , zresr , zpice                 )
+      CALL wrk_dealloc( jpi,jpj, zs1   , zs2   , zs12   , zresr , zpice                 )
 
    END SUBROUTINE lim_rhg