Changeset 3823 for branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90

Timestamp:

2013-02-28T14:31:33+01:00 (11 years ago)

Author:

cetlod

Message:

dev_r3411_CNRS4_IOCRS : minor bugfix + style

File:

• branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90 (modified) (8 diffs)

branches/2013/dev_r3411_CNRS4_IOCRS/NEMOGCM/NEMO/OPA_SRC/CRS/crsdomwri.F90

@@ -69 +69 @@
       IF( nn_timing == 1 )  CALL timing_start('crs_dom_wri')
       !
-      ALLOCATE( zprt(jpi_crs,jpj_crs) , zprw(jpi_crs,jpj_crs) )
-      ALLOCATE( zdepu(jpi_crs,jpj_crs,jpk) , zdepv(jpi_crs,jpj_crs,jpk) )
-      ALLOCATE( ze3tp(jpi_crs,jpj_crs) , ze3wp(jpi_crs,jpj_crs) )
+      ALLOCATE( zprt  (jpi_crs,jpj_crs)   , zprw(jpi_crs,jpj_crs) )
+      ALLOCATE( zdepu(jpi_crs,jpj_crs,jpk), zdepv(jpi_crs,jpj_crs,jpk) )
+      ALLOCATE( ze3tp(jpi_crs,jpj_crs)    , ze3wp(jpi_crs,jpj_crs) )
 
       ze3tp(:,:) = 0.0
@@ -118 +118 @@
       !========================================================
       !                                                         ! masks (inum2) 
-      CALL crs_iom_rstput( 0, 0, inum2, 'tmask_crs', pv_r3d=tmask_crs, ktype = jp_i1 )     !    ! land-sea mask
-      CALL crs_iom_rstput( 0, 0, inum2, 'umask_crs', pv_r3d=umask_crs, ktype = jp_i1 )
-      CALL crs_iom_rstput( 0, 0, inum2, 'vmask_crs', pv_r3d=vmask_crs, ktype = jp_i1 )
-      CALL crs_iom_rstput( 0, 0, inum2, 'fmask_crs', pv_r3d=fmask_crs, ktype = jp_i1 )
+      CALL crs_iom_rstput( 0, 0, inum2, 'tmask', pv_r3d=tmask_crs, ktype = jp_i1 )     !    ! land-sea mask
+      CALL crs_iom_rstput( 0, 0, inum2, 'umask', pv_r3d=umask_crs, ktype = jp_i1 )
+      CALL crs_iom_rstput( 0, 0, inum2, 'vmask', pv_r3d=vmask_crs, ktype = jp_i1 )
+      CALL crs_iom_rstput( 0, 0, inum2, 'fmask', pv_r3d=fmask_crs, ktype = jp_i1 )
       
       CALL crs_dom_uniq( zprw, 'T' )
       tmask_i_crs(:,:) = tmask_crs(:,:,1) * zprw                               !    ! unique point mask
-      CALL crs_iom_rstput( 0, 0, inum2, 'tmaskutil_crs', pv_r2d=tmask_i_crs, ktype = jp_i1 )  
+      CALL crs_iom_rstput( 0, 0, inum2, 'tmaskutil', pv_r2d=tmask_i_crs, ktype = jp_i1 )  
       CALL crs_dom_uniq( zprw, 'U' )
       zprt = umask_crs(:,:,1) * zprw
-      CALL crs_iom_rstput( 0, 0, inum2, 'umaskutil_crs', pv_r2d=zprt, ktype = jp_i1 )  
+      CALL crs_iom_rstput( 0, 0, inum2, 'umaskutil', pv_r2d=zprt, ktype = jp_i1 )  
       CALL crs_dom_uniq( zprw, 'V' )
       zprt = vmask_crs(:,:,1) * zprw
-      CALL crs_iom_rstput( 0, 0, inum2, 'vmaskutil_crs', pv_r2d=zprt, ktype = jp_i1 )  
+      CALL crs_iom_rstput( 0, 0, inum2, 'vmaskutil', pv_r2d=zprt, ktype = jp_i1 )  
       CALL crs_dom_uniq( zprw, 'F' )
       zprt = fmask_crs(:,:,1) * zprw
-      CALL crs_iom_rstput( 0, 0, inum2, 'fmaskutil_crs', pv_r2d=zprt, ktype = jp_i1 )  
+      CALL crs_iom_rstput( 0, 0, inum2, 'fmaskutil', pv_r2d=zprt, ktype = jp_i1 )  
       !========================================================
       !                                                         ! horizontal mesh (inum3)
@@ -157 +157 @@
       CALL crs_iom_rstput( 0, 0, inum3, 'e2f', pv_r2d=e2f_crs, ktype = jp_r8 )
       
-      CALL crs_iom_rstput( 0, 0, inum3, 'ff_crs', pv_r2d=ff_crs, ktype = jp_r8 )           !    ! coriolis factor
+      CALL crs_iom_rstput( 0, 0, inum3, 'ff', pv_r2d=ff_crs, ktype = jp_r8 )           !    ! coriolis factor
 
       !========================================================
@@ -184 +184 @@
             CALL crs_lbc_lnk( 'W', 1.0, ze3wp )
   
-            CALL crs_iom_rstput( 0, 0, inum4, 'e3t_ps_crs', pv_r2d=ze3tp )      
-            CALL crs_iom_rstput( 0, 0, inum4, 'e3w_ps_crs', pv_r2d=ze3wp )
+            CALL crs_iom_rstput( 0, 0, inum4, 'e3t_ps', pv_r2d=ze3tp )      
+            CALL crs_iom_rstput( 0, 0, inum4, 'e3w_ps', pv_r2d=ze3wp )
          ENDIF
 
          IF ( nn_msh_crs <= 3 ) THEN
-            CALL crs_iom_rstput( 0, 0, inum4, 'gdept_crs', pv_r3d=gdept_crs, ktype = jp_r4 ) 
+            CALL crs_iom_rstput( 0, 0, inum4, 'gdept', pv_r3d=gdept_crs, ktype = jp_r4 ) 
             DO jk = 1,jpk   
                DO jj = 1, jpj_crsm1   
@@ -200 +200 @@
 
             CALL crs_lbc_lnk( 'U', 1.,pt3d1=zdepu )   ;   CALL crs_lbc_lnk( 'V', 1.,pt3d1=zdepv ) 
-            CALL crs_iom_rstput( 0, 0, inum4, 'gdepu_crs', pv_r3d=zdepu, ktype = jp_r4 )
-            CALL crs_iom_rstput( 0, 0, inum4, 'gdepv_crs', pv_r3d=zdepv, ktype = jp_r4 )
-            CALL crs_iom_rstput( 0, 0, inum4, 'gdepw_crs', pv_r3d=gdepw_crs, ktype = jp_r4 )
+            CALL crs_iom_rstput( 0, 0, inum4, 'gdepu', pv_r3d=zdepu, ktype = jp_r4 )
+            CALL crs_iom_rstput( 0, 0, inum4, 'gdepv', pv_r3d=zdepv, ktype = jp_r4 )
+            CALL crs_iom_rstput( 0, 0, inum4, 'gdepw', pv_r3d=gdepw_crs, ktype = jp_r4 )
          ELSE
             DO jj = 1,jpj_crs   
@@ -214 +214 @@
          ENDIF
 
-         CALL iom_rstput( 0, 0, inum4, 'gdept_0_crs', gdept_0 )     !    ! reference z-coord.
-         CALL iom_rstput( 0, 0, inum4, 'gdepw_0_crs', gdepw_0 )
-         CALL iom_rstput( 0, 0, inum4, 'e3t_0_crs'  , e3t_0   )
-         CALL iom_rstput( 0, 0, inum4, 'e3w_0_crs'  , e3w_0   )
-
-         CALL crs_iom_rstput(  0, 0, inum4, 'ocean_volume_crs_t', pv_r3d=ocean_volume_crs_t ) 
+         CALL iom_rstput( 0, 0, inum4, 'gdept_0', gdept_0 )     !    ! reference z-coord.
+         CALL iom_rstput( 0, 0, inum4, 'gdepw_0', gdepw_0 )
+         CALL iom_rstput( 0, 0, inum4, 'e3t_0'  , e3t_0   )
+         CALL iom_rstput( 0, 0, inum4, 'e3w_0'  , e3w_0   )
+
+         CALL crs_iom_rstput(  0, 0, inum4, 'ocean_volume_t', pv_r3d=ocean_volume_crs_t ) 
          CALL crs_iom_rstput(  0, 0, inum4, 'facvol_t' , pv_r3d=facvol_t ) 
          CALL crs_iom_rstput(  0, 0, inum4, 'facvol_w' , pv_r3d=facvol_w ) 
@@ -230 +230 @@
          CALL crs_iom_rstput(  0, 0, inum4, 'e2e3u'    , pv_r3d=e2e3u    ) 
          CALL crs_iom_rstput(  0, 0, inum4, 'e1e3v'    , pv_r3d=e1e3v    )
-         CALL crs_iom_rstput(  0, 0, inum4, 'bt_crs'   , pv_r3d=bt_crs   )
-         CALL crs_iom_rstput(  0, 0, inum4, 'r1_bt_crs', pv_r3d=r1_bt_crs)
+         CALL crs_iom_rstput(  0, 0, inum4, 'bt'       , pv_r3d=bt_crs   )
+         CALL crs_iom_rstput(  0, 0, inum4, 'r1_bt'    , pv_r3d=r1_bt_crs)
 
          CALL crs_iom_rstput(  0, 0, inum4, 'crs_surfu_wgt', pv_r3d=crs_surfu_wgt) 
@@ -243 +243 @@
      IF( ln_zco ) THEN
          !                                                      ! z-coordinate - full steps
-        CALL iom_rstput( 0, 0, inum4, 'gdept_0_crs', gdept_0 )     !    ! depth
-        CALL iom_rstput( 0, 0, inum4, 'gdepw_0_crs', gdepw_0 )
-        CALL iom_rstput( 0, 0, inum4, 'e3t_0_crs'  , e3t_0   )     !    ! scale factors
-        CALL iom_rstput( 0, 0, inum4, 'e3w_0_crs'  , e3w_0   )
+        CALL iom_rstput( 0, 0, inum4, 'gdept_0', gdept_0 )     !    ! depth
+        CALL iom_rstput( 0, 0, inum4, 'gdepw_0', gdepw_0 )
+        CALL iom_rstput( 0, 0, inum4, 'e3t_0'  , e3t_0   )     !    ! scale factors
+        CALL iom_rstput( 0, 0, inum4, 'e3w_0'  , e3w_0   )
      ENDIF
       !                                     ! ============================