Changeset 2004 for branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3

Timestamp:

2010-07-09T14:40:45+02:00 (14 years ago)

Author:

acc

Message:

ticket #684 step 8: Add in changes from the trunk between revisions 1879 and the 3.2.1 tag (rev 1986)

Location:

branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3

Files:

• limmsh.F90 (modified) (1 diff)
• limtrp.F90 (modified) (1 diff)

branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3/limmsh.F90

@@ -53 +53 @@
          WRITE(numout,*) '~~~~~~~'
       ENDIF
+
+      IF( jphgr_msh == 2 .OR. jphgr_msh == 3 .OR. jphgr_msh == 5 )   &
+          &      CALL ctl_stop(' Coriolis parameter in LIM not set for f- or beta-plane' )
 
       !                           !==  coriolis factor & Equator position ==!

branches/DEV_r1784_mid_year_merge_2010/NEMO/LIM_SRC_3/limtrp.F90

@@ -204 +204 @@
          zusnit = 1.0 / REAL( initad ) 
 
-         IF ( MOD( nday , 2 ) == 0) THEN
+         IF( MOD( ( kt - 1) / nn_fsbc , 2 ) == 0) THEN        !==  odd ice time step:  adv_x then adv_y  ==!
             DO jk = 1,initad
                !--- ice open water area