Changeset 4792 for branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

Timestamp:

2014-09-26T13:04:47+02:00 (10 years ago)

Author:

jamesharle

Message:

Updates to code after first successful test + merge with HEAD of trunk

File:

• branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90 (modified) (7 diffs)

branches/2014/dev_r4621_NOC4_BDY_VERT_INTERP/NEMOGCM/NEMO/OPA_SRC/BDY/bdyini.F90

@@ -100 +100 @@
          &             cn_dyn3d, nn_dyn3d_dta, cn_tra, nn_tra_dta,             &  
          &             ln_tra_dmp, ln_dyn3d_dmp, rn_time_dmp, rn_time_dmp_out, &
-#if ( defined key_lim2 || defined key_lim3 )
          &             cn_ice_lim, nn_ice_lim_dta,                           &
-#endif
+         &             rn_ice_tem, rn_ice_sal, rn_ice_age,                 &
          &             ln_vol, nn_volctl, nn_rimwidth, nb_jpk_bdy
       !!
@@ -132 +131 @@
       READ  ( numnam_cfg, nambdy, IOSTAT = ios, ERR = 902 )
 902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy in configuration namelist', lwp )
-      WRITE ( numond, nambdy )
+      IF(lwm) WRITE ( numond, nambdy )
 
       ! -----------------------------------------
@@ -359 +358 @@
         ENDIF
         IF(lwp) WRITE(numout,*)
+        IF(lwp) WRITE(numout,*) '      tem of bdy sea-ice = ', rn_ice_tem(ib_bdy)         
+        IF(lwp) WRITE(numout,*) '      sal of bdy sea-ice = ', rn_ice_sal(ib_bdy)         
+        IF(lwp) WRITE(numout,*) '      age of bdy sea-ice = ', rn_ice_age(ib_bdy)         
 #endif
 
@@ -384 +386 @@
         ELSE
            IF(lwp) WRITE(numout,*) '*** open boundary will be read straight onto the native grid without vertical interpolation ***'
+        ENDIF
      ENDIF
 
@@ -422 +425 @@
             READ  ( numnam_cfg, nambdy_index, IOSTAT = ios, ERR = 904 )
 904         IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_index in configuration namelist', lwp )
-            WRITE ( numond, nambdy_index )
+            IF(lwm) WRITE ( numond, nambdy_index )
 
             SELECT CASE ( TRIM(ctypebdy) )
@@ -509 +512 @@
             &      nbrdta(jpbdta, jpbgrd, nb_bdy) )
 
-         IF( jpk_bdy>0 ) THEN
-            ALLOCATE( dta_global(jpbdtau, 1, jpk_bdy) )
-            ALLOCATE( dta_global_z(jpbdtau, 1, jpk_bdy) )
+         IF( nb_jpk_bdy>0 ) THEN
+            ALLOCATE( dta_global(jpbdtau, 1, nb_jpk_bdy) )
+            ALLOCATE( dta_global_z(jpbdtau, 1, nb_jpk_bdy) )
          ELSE
             ALLOCATE( dta_global(jpbdtau, 1, jpk) )
@@ -518 +521 @@
 
          IF ( icount>0 ) THEN
-            IF( jpk_bdy>0 ) THEN
-               ALLOCATE( dta_global2(jpbdtas, nrimmax, jpk_bdy) )
-               ALLOCATE( dta_global2_z(jpbdtas, nrimmax, jpk_bdy) )
+            IF( nb_jpk_bdy>0 ) THEN
+               ALLOCATE( dta_global2(jpbdtas, nrimmax, nb_jpk_bdy) )
+               ALLOCATE( dta_global2_z(jpbdtas, nrimmax, nb_jpk_bdy) )
             ELSE
                ALLOCATE( dta_global2(jpbdtas, nrimmax, jpk) )
                ALLOCATE( dta_global2_z(jpbdtas, nrimmax, jpk) )
             ENDIF
+         ENDIF
          ! 
       ENDIF