Changeset 14062 for NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/IOM/iom.F90

Timestamp:

2020-12-03T17:39:30+01:00 (4 years ago)

Author:

ayoung

Message:

Updating to trunk at 14060 and resolving conflicts with ticket #2480. Ticket #2506.

File:

• NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/IOM/iom.F90 (modified) (5 diffs)

NEMO/branches/2020/dev_r13333_KERNEL-08_techene_gm_HPG_SPG/src/OCE/IOM/iom.F90

@@ -174 +174 @@
          CALL set_grid( "V", glamv, gphiv, .FALSE., .FALSE. )
          CALL set_grid( "W", glamt, gphit, .FALSE., .FALSE. )
+         CALL set_grid( "F", glamf, gphif, .FALSE., .FALSE. )
          CALL set_grid_znl( gphit )
          !
@@ -180 +181 @@
             CALL iom_set_domain_attr("grid_U", area = real( e1e2u(Nis0:Nie0, Njs0:Nje0), dp))
             CALL iom_set_domain_attr("grid_V", area = real( e1e2v(Nis0:Nie0, Njs0:Nje0), dp))
-            CALL iom_set_domain_attr("grid_W", area = real( e1e2t(Nis0:Nie0, Njs0:Nje0), dp))
+            CALL iom_set_domain_attr("grid_W", area = REAL( e1e2t(Nis0:Nie0, Njs0:Nje0), dp))
+            CALL iom_set_domain_attr("grid_F", area = real( e1e2f(Nis0:Nie0, Njs0:Nje0), dp))
             CALL set_grid_bounds( "T", glamf, gphif, glamt, gphit )
             CALL set_grid_bounds( "U", glamv, gphiv, glamu, gphiu )
             CALL set_grid_bounds( "V", glamu, gphiu, glamv, gphiv )
             CALL set_grid_bounds( "W", glamf, gphif, glamt, gphit )
+            CALL set_grid_bounds( "F", glamt, gphit, glamf, gphif )
          ENDIF
       ENDIF
@@ -191 +194 @@
          CALL dom_grid_crs   ! Save the parent grid information  & Switch to coarse grid domain
          !
-         CALL set_grid( "T", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 
-         CALL set_grid( "U", glamu_crs, gphiu_crs, .FALSE., .FALSE. ) 
-         CALL set_grid( "V", glamv_crs, gphiv_crs, .FALSE., .FALSE. ) 
-         CALL set_grid( "W", glamt_crs, gphit_crs, .FALSE., .FALSE. ) 
+         CALL set_grid( "T", glamt_crs, gphit_crs, .FALSE., .FALSE. )
+         CALL set_grid( "U", glamu_crs, gphiu_crs, .FALSE., .FALSE. )
+         CALL set_grid( "V", glamv_crs, gphiv_crs, .FALSE., .FALSE. )
+         CALL set_grid( "W", glamt_crs, gphit_crs, .FALSE., .FALSE. )
          CALL set_grid_znl( gphit_crs )
           !
@@ -217 +220 @@
          CALL iom_set_axis_attr(  "depthv", paxis = gdept_1d )
          CALL iom_set_axis_attr(  "depthw", paxis = gdepw_1d )
+          CALL iom_set_axis_attr(  "depthf", paxis = gdept_1d )
 
           ! ABL
@@ -238 +242 @@
          CALL iom_set_axis_attr(  "depthv", bounds=zw_bnds )
          CALL iom_set_axis_attr(  "depthw", bounds=zt_bnds )
+          CALL iom_set_axis_attr(  "depthf", bounds=zw_bnds )
 
          ! ABL