Changeset 1493

Timestamp:

2009-07-17T14:27:43+02:00 (15 years ago)

Author:

ctlod

Message:

ensure restartability of GYRE & GYRE_LOBSTER configurations, see ticket: #473

Location:

trunk/NEMO/OPA_SRC

Files:

• eosbn2.F90 (modified) (5 diffs)
• opa.F90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -56 +56 @@
    REAL(wp), PUBLIC ::   rbeta  = 7.7e-4   !: saline  expension coeff. (linear equation of state)
    
-   INTEGER ::   neos_init = 0         !: control flag for initialization
-
    !! * Substitutions
 #  include "domzgr_substitute.h90"
@@ -119 +117 @@
       !!----------------------------------------------------------------------
 
-      IF( neos_init == 0 ) CALL eos_init      ! initialization (in not already done)
-
       SELECT CASE ( neos )
       !
@@ -277 +273 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) ::   zws
       !!----------------------------------------------------------------------
-
-      IF( neos_init == 0 ) CALL eos_init      ! initialization (in not already done)
 
       SELECT CASE ( neos )
@@ -433 +427 @@
       !!----------------------------------------------------------------------
 
-      IF( neos_init == 0 ) CALL eos_init      ! initialization (in not already done)
-
       prd(:,:) = 0.e0
 
@@ -722 +714 @@
       NAMELIST/nameos/ neos, ralpha, rbeta
 
-      neos_init = 1               ! indicate that the initialization has been done
-
       REWIND( numnam )            ! Read Namelist nameos : equation of state
       READ  ( numnam, nameos )

trunk/NEMO/OPA_SRC/opa.F90

@@ -272 +272 @@
       CALL phy_cst                          ! Physical constants
 
+      CALL eos_init                         ! Equation of state
+
       CALL dom_cfg                          ! Domain configuration