Changeset 374

Timestamp:

2006-01-03T16:04:15+01:00 (19 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_015 : CT : - correct the initialization step

• update comments

Location:

trunk/NEMO/OPA_SRC

Files:

• DYN/dynspg_ts.F90 (modified) (2 diffs)
• DYN/dynspg_ts_jki.F90 (modified) (2 diffs)
• OBC/obcfla.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -115 +115 @@
          IF(lwp) WRITE(numout,*) ' Number of sub cycle in 1 time-step (2 rdt) : icycle = ', FLOOR( 2*rdt/rdtbt )
 
-         IF( ln_rstart ) THEN
+         IF( .NOT. ln_rstart ) THEN
             ! initialize barotropic specific arrays
             sshb_b(:,:) = sshb(:,:)
@@ -158 +158 @@
       z2dt_b = 2.0 * rdt                                    ! baroclinic time step
       IF ( neuler == 0 .AND. kt == nit000 ) z2dt_b = rdt
-      zfact1 = 0.5 * 0.25                                     ! coefficient for vorticity estimates
+      zfact1 = 0.5 * 0.25                                   ! coefficient for vorticity estimates
       zfact2 = 0.5 * 0.5
-      zraur  = 1. / rauw                                   ! 1 / volumic mass of pure water
+      zraur  = 1. / rauw                                    ! 1 / volumic mass of pure water
       
       ! -----------------------------------------------------------------------------

trunk/NEMO/OPA_SRC/DYN/dynspg_ts_jki.F90

@@ -114 +114 @@
          IF(lwp) WRITE(numout,*) ' Number of sub cycle in 1 time-step (2 rdt) : icycle = ', FLOOR( 2*rdt/rdtbt )
 
-         IF( ln_rstart ) THEN
+         IF( .NOT. ln_rstart ) THEN
             ! initialize barotropic specific arrays
             sshb_b(:,:) = sshb(:,:)
@@ -148 +148 @@
       z2dt_b = 2.0 * rdt                                    ! baroclinic time step
       IF ( neuler == 0 .AND. kt == nit000 ) z2dt_b = rdt
-      zfact1 = 0.5 * 0.25                                     ! coefficient for vorticity estimates
+      zfact1 = 0.5 * 0.25                                   ! coefficient for vorticity estimates
       zfact2 = 0.5 * 0.5
-      zraur  = 1. / rauw                                   ! 1 / volumic mass of pure water
+      zraur  = 1. / rauw                                    ! 1 / volumic mass of pure water
       
       ! -----------------------------------------------------------------------------

trunk/NEMO/OPA_SRC/OBC/obcfla.F90

@@ -43 +43 @@
       !! ** Purpose :
       !!      Apply Flather's algorithm at open boundaries for the time-splitting
-      !!      free surface case
-      !!
-      !!      This routine is called in dynnxt.F routine and updates ua, va and sshn.
+      !!      free surface case (barotropic variables)
+      !!
+      !!      This routine is called in dynspg_ts.F90 routine 
       !!
       !!      The logical variable lp_obc_east, and/or lp_obc_west, and/or lp_obc_north,
       !!      and/or lp_obc_south allow the user to determine which boundary is an
-      !!      open one (must be done in the param_obc.h90 file).
+      !!      open one (must be done in the obc_par.F90 file).
       !!
       !! ** Reference :
@@ -73 +73 @@
       !!      Apply Flather's algorithm on east OBC velocities ua, va
       !!      Fix sea surface height (sshn_e) on east open boundary
-      !!      The logical lfbceast must be .TRUE.
       !!
       !!  History :
@@ -112 +111 @@
       !!      Apply Flather's algorithm on west OBC velocities ua, va
       !!      Fix sea surface height (sshn_e) on west open boundary
-      !!      The logical lfbcwest must be .TRUE.
       !!
       !!  History :
@@ -148 +146 @@
       !!      Apply Flather's algorithm on north OBC velocities ua, va
       !!      Fix sea surface height (sshn_e) on north open boundary
-      !!      The logical lfbcnorth must be .TRUE.
       !!
       !!  History :
@@ -186 +183 @@
       !!      Apply Flather's algorithm on south OBC velocities ua, va
       !!      Fix sea surface height (sshn_e) on south open boundary
-      !!      The logical lfbcsouth must be .TRUE.
-      !!
-      !!  History :
-      !!   9.0  !  05-12  (V. Garnier) original
-      !!------------------------------------------------------------------------------
-      !! * Local declaration
-      INTEGER ::   ji, jj, jk ! dummy loop indices
-
-      !!------------------------------------------------------------------------------
-      !!  OPA 8.5, LODYC-IPSL (2002)
+      !!
+      !!  History :
+      !!   9.0  !  05-12  (V. Garnier) original
+      !!------------------------------------------------------------------------------
+      !! * Local declaration
+      INTEGER ::   ji, jj, jk ! dummy loop indices
+
       !!------------------------------------------------------------------------------