Changeset 746 for trunk/NEMO

Timestamp:

2007-12-06T18:03:18+01:00 (16 years ago)

Author:

smasson

Message:

implement ldstop in iom_varid, see ticket:21

Location:

trunk/NEMO/OPA_SRC

Files:

• DYN/dynspg_exp.F90 (modified) (1 diff)
• DYN/dynspg_flt.F90 (modified) (1 diff)
• DYN/dynspg_rl.F90 (modified) (1 diff)
• DYN/dynspg_ts.F90 (modified) (2 diffs)
• SOL/solisl.F90 (modified) (1 diff)
• ZDF/zdftke.F90 (modified) (1 diff)
• restart.F90 (modified) (5 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_exp.F90

@@ -237 +237 @@
       !
       IF( TRIM(cdrw) == 'READ' ) THEN
-         IF( iom_varid( numror, 'sshn' ) > 0 ) THEN
+         IF( iom_varid( numror, 'sshn', ldstop = .FALSE. ) > 0 ) THEN
             CALL iom_get( numror, jpdom_autoglo, 'sshb'  , sshb(:,:)   )
             CALL iom_get( numror, jpdom_autoglo, 'sshn'  , sshn(:,:)   )

trunk/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -450 +450 @@
 
      IF( TRIM(cdrw) == 'READ' ) THEN
-        IF( iom_varid( numror, 'gcx' ) > 0 ) THEN
+        IF( iom_varid( numror, 'gcx', ldstop = .FALSE. ) > 0 ) THEN
 ! Caution : extra-hallow
 ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj)

trunk/NEMO/OPA_SRC/DYN/dynspg_rl.F90

@@ -514 +514 @@
      !
      IF( TRIM(cdrw) == 'READ' ) THEN
-        IF( iom_varid( numror, 'gcx' ) > 0 ) THEN
+        IF( iom_varid( numror, 'gcx', ldstop = .FALSE. ) > 0 ) THEN
      ! Caution : extra-hallow
      ! gcx and gcxb are defined as: DIMENSION(1-jpr2di:jpi+jpr2di,1-jpr2dj:jpj+jpr2dj)

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -626 +626 @@
       !
       IF( TRIM(cdrw) == 'READ' ) THEN
-         IF( iom_varid( numror, 'sshn' ) > 0 ) THEN
+         IF( iom_varid( numror, 'sshn', ldstop = .FALSE. ) > 0 ) THEN
             CALL iom_get( numror, jpdom_autoglo, 'sshb'  , sshb(:,:)   )
             CALL iom_get( numror, jpdom_autoglo, 'sshn'  , sshn(:,:)   )
@@ -636 +636 @@
             ENDIF
          ENDIF
-         IF( iom_varid( numror, 'sshn_b' ) > 0 ) THEN
+         IF( iom_varid( numror, 'sshn_b', ldstop = .FALSE. ) > 0 ) THEN
             CALL iom_get( numror, jpdom_autoglo, 'sshb_b', sshb_b(:,:) )   ! free surface issued
             CALL iom_get( numror, jpdom_autoglo, 'sshn_b', sshn_b(:,:) )   ! from time-splitting loop

trunk/NEMO/OPA_SRC/SOL/solisl.F90

@@ -571 +571 @@
       ! Lecture
       CALL iom_open ( 'islands', inum )
-      ios = iom_varid( inum, 'aisl' )
+      ios = iom_varid( inum, 'aisl', ldstop = .FALSE. )
       IF( ios > 0 ) THEN
 

trunk/NEMO/OPA_SRC/ZDF/zdftke.F90

@@ -799 +799 @@
      IF( TRIM(cdrw) == 'READ' ) THEN
         IF( ln_rstart ) THEN
-           IF( iom_varid( numror, 'en' ) > 0 .AND. .NOT.(ln_rstke) ) THEN 
+           IF( iom_varid( numror, 'en', ldstop = .FALSE. ) > 0 .AND. .NOT.(ln_rstke) ) THEN 
               CALL iom_get( numror, jpdom_autoglo, 'en', en )
            ELSE
-              IF(lwp .AND. iom_varid(numror,'en') > 0 ) WRITE(numout,*) ' ===>>>> : previous run without tke scheme'
-              IF(lwp .AND. ln_rstke ) WRITE(numout,*) ' ===>>>> : We do not use en from the restart file'
-              IF(lwp) WRITE(numout,*) ' ===>>>> : en set by iterative loop'
-              IF(lwp) WRITE(numout,*) ' =======             ========='
+              IF( lwp .AND. iom_varid( numror, 'en', ldstop = .FALSE. ) > 0 )   &
+                 &                       WRITE(numout,*) ' ===>>>> : previous run without tke scheme'
+              IF( lwp .AND. ln_rstke )   WRITE(numout,*) ' ===>>>> : We do not use en from the restart file'
+              IF( lwp                )   WRITE(numout,*) ' ===>>>> : en set by iterative loop'
+              IF( lwp                )   WRITE(numout,*) ' =======             ========='
               en (:,:,:) = emin * tmask(:,:,:)
               DO jit = 2, nitke+1

trunk/NEMO/OPA_SRC/restart.F90

@@ -266 +266 @@
       ENDIF
       ! Check dynamics and tracer time-step consistency and force Euler restart if changed
-      IF( iom_varid( numror, 'rdt' ) > 0 )   THEN
+      IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 )   THEN
          CALL iom_get( numror, 'rdt', zrdt )
          IF( zrdt /= rdt )   neuler = 0
       ENDIF
-      IF( iom_varid( numror, 'rdttra1' ) > 0 )   THEN
+      IF( iom_varid( numror, 'rdttra1', ldstop = .FALSE. ) > 0 )   THEN
          CALL iom_get( numror, 'rdttra1', zrdttra1 )
          IF( zrdttra1 /= rdttra(1) )   neuler = 0
@@ -304 +304 @@
 #if defined key_ice_lim
       ! Louvain La Neuve Sea Ice Model
-      IF( iom_varid( numror, 'nfice' ) > 0 ) then 
+      IF( iom_varid( numror, 'nfice', ldstop = .FALSE. ) > 0 ) then 
          CALL iom_get( numror             , 'nfice'  , znfice  )   ! ice computation frequency
          CALL iom_get( numror, jpdom_autoglo, 'sst_io' , sst_io  )
@@ -341 +341 @@
 #if defined key_flx_bulk_monthly || defined key_flx_bulk_daily || defined key_flx_core 
       ! Louvain La Neuve Sea Ice Model
-      IF( iom_varid( numror, 'nfbulk' ) > 0 ) THEN 
+      IF( iom_varid( numror, 'nfbulk', ldstop = .FALSE. ) > 0 ) THEN 
          CALL iom_get( numror             , 'nfbulk', znfbulk )   ! bulk computation frequency
          CALL iom_get( numror, jpdom_autoglo, 'gsst'  , gsst    )
@@ -358 +358 @@
       !!sm: end of TO BE MOVED IN NEW SURFACE MODULE...
 
-      IF( iom_varid( numror, 'rhd' ) > 0 ) THEN
+      IF( iom_varid( numror, 'rhd', ldstop = .FALSE. ) > 0 ) THEN
          CALL iom_get( numror, jpdom_autoglo, 'rhd' , rhd  )
          CALL iom_get( numror, jpdom_autoglo, 'rhop', rhop )
@@ -365 +365 @@
       ENDIF
       IF( ln_zps .AND. .NOT. lk_cfg_1d ) THEN
-         IF( iom_varid( numror, 'gtu' ) > 0 ) THEN
+         IF( iom_varid( numror, 'gtu', ldstop = .FALSE. ) > 0 ) THEN
             CALL iom_get( numror, jpdom_autoglo, 'gtu' , gtu )
             CALL iom_get( numror, jpdom_autoglo, 'gsu' , gsu )