Changeset 3525 for branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limdia.F90

Timestamp:

2012-11-02T07:38:20+01:00 (12 years ago)

Author:

gm

Message:

Branch: dev_r3385_NOCS04_HAMF; #665. bug correction in limdia for Fram strait transport

File:

• branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limdia.F90 (modified) (2 diffs)

branches/2012/dev_r3385_NOCS04_HAMF/NEMOGCM/NEMO/LIM_SRC_3/limdia.F90

@@ -71 +71 @@
       !!              the temporal evolution of some key variables
       !!-------------------------------------------------------------------
-      INTEGER  ::   jv, ji, jj, jl   ! dummy loop indices
-      REAL(wp) ::   zshift_date      ! date from the minimum ice extent
-      REAL(wp) ::   zday, zday_min   ! current day, day of minimum extent
-      REAL(wp) ::   zafy, zamy       ! temporary area of fy and my ice
+      INTEGER  ::   jv, ji, jj, jl       ! dummy loop indices
+      INTEGER  ::   ii0, ii1, ij0, ij1   ! temporary integer
+      REAL(wp) ::   zshift_date          ! date from the minimum ice extent
+      REAL(wp) ::   zday, zday_min       ! current day, day of minimum extent
+      REAL(wp) ::   zafy, zamy           ! temporary area of fy and my ice
       REAL(wp) ::   zindb
-      REAL(wp), DIMENSION(jpinfmx) ::   vinfor           ! temporary working space 
+      REAL(wp), DIMENSION(jpinfmx) ::   vinfor   ! 1D workspace 
       !!-------------------------------------------------------------------
 
@@ -232 +233 @@
       vinfor(51) = zindb*vinfor(51) / MAX(vinfor(27),epsi06)
 
-      !! Fram Strait Export
-!!gm BUG : hard coded ORCA2 case !!!   ===>>>> to be removed !!!!
-!!gm       moreover, this is NOT the correct way of evaluating a ice transport !
-!!gm                 mass of snow + ice is missing and a j, j+1 is also missing
-!!gm BUG in MPP case ! 
-      !! 83 = area export
-      !! 84 = volume export
-      !! Fram strait in ORCA2 = 5 points
-      !! export = -v_ice*e1t*ddtb*at_i or -v_ice*e1t*ddtb*at_i*h_i
-      jj = 136 ! C grid
-      vinfor(83) = 0.0
-      vinfor(84) = 0.0
-      DO ji = 134, 138
-         vinfor(83) = vinfor(83) - v_ice(ji,jj) * e1t(ji,jj)*at_i(ji,jj)*rdt_ice * 1.e-12_wp
-         vinfor(84) = vinfor(84) - v_ice(ji,jj) * e1t(ji,jj)*vt_i(ji,jj)*rdt_ice * 1.e-12_wp
-      END DO
-!!gm en BUG
+      IF( cp_cfg == "orca" ) THEN   !* ORCA configuration : Fram Strait Export
+         SELECT CASE ( jp_cfg )
+         CASE ( 2 )                          ! ORCA_R2
+            ij0 = 136   ;   ij1 = 136              ! Fram strait : 83 = area export
+            ii0 = 134   ;   ii1 = 138              !               84 = volume export
+            DO jj = mj0(ij0):mj1(ij1)
+               DO ji = mi0(ii0):mi1(ii1)
+                  vinfor(83) = vinfor(83) - v_ice(ji,jj) * e1t(ji,jj)*at_i(ji,jj)*rdt_ice * 1.e-12_wp
+                  vinfor(84) = vinfor(84) - v_ice(ji,jj) * e1t(ji,jj)*vt_i(ji,jj)*rdt_ice * 1.e-12_wp
+               END DO
+            END DO
+!!gm   just above, this is NOT the correct way of evaluating the transport !
+!!gm        mass of snow is missing and v_ice should be the mean between jj and jj+1
+!!gm   Other ORCA configurations should be added
+      ENDIF
 
       !!-------------------------------------------------------------------