Changeset 894

Timestamp:

2008-04-21T14:36:04+02:00 (16 years ago)

Author:

rblod

Message:

Correct remaining bugs in LIM3 implementation, see ticket #71

Location:

trunk/NEMO/LIM_SRC_3

Files:

• ice.F90 (modified) (1 diff)
• limdia.F90 (modified) (3 diffs)
• limitd_me.F90 (modified) (1 diff)
• limupdate.F90 (modified) (1 diff)

trunk/NEMO/LIM_SRC_3/ice.F90

@@ -455 +455 @@
    !!--------------------------------------------------------------------------
    ! REMOVE
-   INTEGER(wp), PUBLIC, DIMENSION(jpl)                ::   &  !:
+   INTEGER, PUBLIC, DIMENSION(jpl)                ::   &  !:
       ice_types      !: Vector making the connection between types and categories
 
-   INTEGER(wp), PUBLIC, DIMENSION(jpm,2)              ::   &  !:
+   INTEGER, PUBLIC, DIMENSION(jpm,2)              ::   &  !:
       ice_cat_bounds !: Matrix containing the integer upper and 
                      !: lower boundaries of ice thickness categories
 
    ! REMOVE
-   INTEGER(wp), PUBLIC, DIMENSION(jpm)                ::   &  !:
+   INTEGER, PUBLIC, DIMENSION(jpm)                ::   &  !:
       ice_ncat_types !: Vector containing the number of thickness categories in each ice type
 

trunk/NEMO/LIM_SRC_3/limdia.F90

@@ -421 +421 @@
        ! oututs on file ice_evolu    
 !MV      IF( MOD( numit , ninfo ) == 0 ) THEN
-          WRITE(90,fmtw) ( titvar(jv), vinfom(jv)/naveg, jv = 1, nvinfo )
+          WRITE(numevo_ice,fmtw) ( titvar(jv), vinfom(jv)/naveg, jv = 1, nvinfo )
           naveg = 0
           DO jv = 1, nvinfo
@@ -453 +453 @@
 
        CHARACTER(len=jpchinf) ::   titinf
+       CHARACTER(len=50)      ::   clname
        !!-------------------------------------------------------------------
 
@@ -576 +577 @@
 
        ! opening  "ice_evolu" file
+       clname = 'ice.evolu'
        irecl = ( jpchinf + 1 ) * nvinfo 
-       OPEN( 90, file='ice.evolu', status='unknown', RECL = irecl)
-       OPEN( 90, file='ice.evolu', status='unknown')
+       CALL ctlopn( numevo_ice, clname, 'UNKNOWN', 'FORMATTED', 'SEQUENTIAL',
+          &         irecl, numout, lwp, 1 )
 
        !- ecriture de 2 lignes d''entete :
-       WRITE(90,1000) fmtr, fmtw, fmtitr, nvinfo, ntot, 0, nfrinf
+       WRITE(numevo_ice,1000) fmtr, fmtw, fmtitr, nvinfo, ntot, 0, nfrinf
        zxx0 = 0.001 * REAL(ninfo)
        zxx1 = 0.001 * REAL(ndeb)
-       WRITE(90,1111) REAL(jpchinf), 0., zxx1, zxx0, 0., 0., 0
+       WRITE(numevo_ice,1111) REAL(jpchinf), 0., zxx1, zxx0, 0., 0., 0
 
        !- ecriture de 2 lignes de titre :
-       WRITE(90,'(A,I8,A,I8,A,I5)')                                      &
+       WRITE(numevo_ice,'(A,I8,A,I8,A,I5)')                                      &
           'Evolution chronologique - Experience '//cexper   &
           //'   de', ndeb, ' a', nferme, ' pas', ninfo
-       WRITE(90,fmtitr) ( titvar(jv), jv = 1, nvinfo )
+       WRITE(numevo_ice,fmtitr) ( titvar(jv), jv = 1, nvinfo )
 
 

trunk/NEMO/LIM_SRC_3/limitd_me.F90

@@ -625 +625 @@
                DO ji = 1, jpi
 
-                  IF                                                           &
-                  (       ( a_i(ji,jj,jl)    .GT. epsi11 )                     &
+                  IF(     ( a_i(ji,jj,jl)    .GT. epsi11 )                     &
                     .AND. ( athorn(ji,jj,jl) .GT. 0.0    ) ) THEN
                      hi = v_i(ji,jj,jl) / a_i(ji,jj,jl)

trunk/NEMO/LIM_SRC_3/limupdate.F90

@@ -942 +942 @@
 !------------
 
-!RB had to split the loop for mpp reproducibility, why ???
-      DO jj = 1, jpj
-         DO ji = 1, jpim1
+      DO jj = 2, jpjm1
+         DO ji = fs_2, fs_jpim1
             IF ( at_i(ji,jj) .EQ. 0.0 ) THEN ! what to do if there is no ice
-               ! mask u
                IF ( at_i(ji+1,jj) .EQ. 0.0 ) u_ice(ji,jj)   = 0.0 ! right side
-            ENDIF
-         END DO
-      END DO
-      DO jj = 1, jpj 
-         DO ji = 2, jpi
-            IF ( at_i(ji,jj) .EQ. 0.0 ) THEN ! what to do if there is no ice
-               ! mask u
                IF ( at_i(ji-1,jj) .EQ. 0.0 ) u_ice(ji-1,jj) = 0.0 ! left side
-            ENDIF
-         END DO
-      END DO
-      DO jj = 1, jpj - 1
-         DO ji = 1, jpi
-            IF ( at_i(ji,jj) .EQ. 0.0 ) THEN ! what to do if there is no ice
-               ! mask u
                IF ( at_i(ji,jj+1) .EQ. 0.0 ) v_ice(ji,jj)   = 0.0 ! upper side
-            ENDIF
-         END DO
-      END DO
-      DO jj = 2, jpj 
-         DO ji = 1, jpi
-            IF ( at_i(ji,jj) .EQ. 0.0 ) THEN ! what to do if there is no ice
-               ! mask u
                IF ( at_i(ji,jj-1) .EQ. 0.0 ) v_ice(ji-1,jj) = 0.0 ! bottom side
             ENDIF