Changeset 3275

Timestamp:

2012-01-25T11:03:39+01:00 (12 years ago)

Author:

charris

Message:

Fix for #899, plus some vvl changes for the CICE interface code.

Location:

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/sbcice_cice.F90 (modified) (3 diffs)
• TRA/traqsr.F90 (modified) (1 diff)
• TRA/trasbc.F90 (modified) (1 diff)

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -14 +14 @@
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
+   USE domvvl
    USE phycst, only : rcp, rau0
    USE in_out_manager  ! I/O manager
@@ -354 +355 @@
 
 ! Freezing/melting potential
-! Calculated over NEMO leapfrog timestep (hence 2*dt), so uses tb in 
-! frzmlt which is then applied in going from tb to ta.
-! May be better using sst_m if not coupling to CICE every time-step
-
-!      nfrzmlt(:,:)=rau0*rcp*fse3t(:,:,1)*(Tocnfrz-sst_m(:,:))/(2.0*dt)
-      nfrzmlt(:,:)=rau0*rcp*fse3t_b(:,:,1)*(Tocnfrz-tsb(:,:,1,jp_tem))/(2.0*dt)
+! Calculated over NEMO leapfrog timestep (hence 2*dt)
+      nfrzmlt(:,:)=rau0*rcp*fse3t_n(:,:,1)*(Tocnfrz-sst_m(:,:))/(2.0*dt)
 
       ztmp(:,:) = nfrzmlt(:,:)
@@ -499 +496 @@
 ! Sublimation from the ice is treated in a similar way (included in emp but not emps)  
 !
-! This will need re-thinking in the variable volume case and if ice is 'embedded' in the 
-! ocean rather than floating on top
-
-      emp(:,:)  = emp(:,:) - tprecip(:,:)*fr_i(:,:)
+! This should not be done in the variable volume case
+
+      IF (.NOT. lk_vvl) THEN
+
+         emp(:,:)  = emp(:,:) - tprecip(:,:)*fr_i(:,:)
 
 ! Take sublimation into account
-      IF (nsbc == 5 ) THEN 
-         emp(:,:) = emp(:,:) + ( emp_ice(:,:) + sprecip(:,:) )
-      ELSE IF (nsbc == 2 ) THEN
-         emp(:,:) = emp(:,:) - qla_ice(:,:,1) / Lsub
+         IF (nsbc == 5 ) THEN 
+            emp(:,:) = emp(:,:) + ( emp_ice(:,:) + sprecip(:,:) )
+         ELSE IF (nsbc == 2 ) THEN
+            emp(:,:) = emp(:,:) - qla_ice(:,:,1) / Lsub
+         ENDIF
+
       ENDIF
 

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/traqsr.F90

@@ -239 +239 @@
                zz1   = ( 1. - rn_abs ) * ro0cpr
                DO jk = 1, nksr                    ! solar heat absorbed at T-point in the top 400m 
-                  DO jj = 2, jpjm1
-                     DO ji = 2, jpim1
+                  DO jj = 1, jpj
+                     DO ji = 1, jpi
                         zc0 = zz0 * EXP( -fsdepw(ji,jj,jk  )*xsi0r ) + zz1 * EXP( -fsdepw(ji,jj,jk  )*xsi1r )
                         zc1 = zz0 * EXP( -fsdepw(ji,jj,jk+1)*xsi0r ) + zz1 * EXP( -fsdepw(ji,jj,jk+1)*xsi1r )

branches/2011/dev_NEMO_MERGE_2011/NEMOGCM/NEMO/OPA_SRC/TRA/trasbc.F90

@@ -164 +164 @@
                                                
       IF( lk_vvl ) THEN                            ! Variable Volume case
-         DO jj = 2, jpj
-            DO ji = fs_2, fs_jpim1   ! vector opt.
+         DO jj = 1, jpj
+            DO ji = 1, jpi 
                ! temperature : heat flux + cooling/heating effet of EMP flux
                sbc_tsc(ji,jj,jp_tem) = ro0cpr * qns(ji,jj) - zsrau * emp(ji,jj) * tsn(ji,jj,1,jp_tem)