Changeset 6101 for branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/step.F90

Timestamp:

2015-12-17T16:48:41+01:00 (8 years ago)

Author:

cbricaud

Message:

correction of bugs from last update and improvments for CRS

File:

• branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/step.F90 (modified) (7 diffs)

branches/2015/dev_r5003_MERCATOR6_CRS/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -33 +33 @@
    USE step_oce         ! time stepping definition modules
    USE iom
-   USE crs
+   use wrk_nemo
 
    IMPLICIT NONE
@@ -76 +76 @@
       INTEGER ::   indic    ! error indicator if < 0
       INTEGER ::   kcall    ! optional integer argument (dom_vvl_sf_nxt)
+      REAL(wp), POINTER, DIMENSION(:,:,:) ::   zrhop,zrhd
+
       !! ---------------------------------------------------------------------
 
@@ -117 +119 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
       !  THERMODYNAMICS
-                         !cbr not used CALL eos_rab( tsb, rab_b )       ! before local thermal/haline expension ratio at T-points
-                         !cbr not used CALL eos_rab( tsn, rab_n )       ! now    local thermal/haline expension ratio at T-points
+                         CALL eos_rab( tsb, rab_b )       ! before local thermal/haline expension ratio at T-points
+                         CALL eos_rab( tsn, rab_n )       ! now    local thermal/haline expension ratio at T-points
                          CALL bn2    ( tsb, rab_b, rn2b ) ! before Brunt-Vaisala frequency
                          CALL bn2    ( tsn, rab_n, rn2  ) ! now    Brunt-Vaisala frequency
@@ -169 +171 @@
                          CALL iom_put("rhd",rhd)
                          CALL iom_put("rn2b",rn2b)
+                         CALL iom_put("rn2",rn2)
                          CALL ldf_slp( kstp, rhd, rn2b )     ! before slope for Madec operator
          ENDIF
@@ -240 +243 @@
       IF( ln_crs     )      CALL crs_fld( kstp )         ! ocean model: online field coarsening & output
 
+      CALL wrk_alloc( jpi, jpj, jpk, zrhop, zrhd )
+      CALL eos( tsn, zrhd, zrhop, fsdept_n(:,:,:) )                 ! now in situ and potential density
+      zrhop(:,:,jpk) = 0._wp
+      CALL iom_put( 'rhop', zrhop )
+
+      CALL wrk_dealloc( jpi, jpj, jpk, zrhop, zrhd )
+
 #if defined key_top
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
@@ -247 +257 @@
                          CALL dom_grid_crs
 
-                         CALL eos_rab_crs( tsn_crs, rab_crs_n )       ! now    local thermal/haline expension ratio at T-points
-                         CALL bn2_crs    ( tsn_crs, rab_crs_n, rb2_crs  ) ! now    Brunt-Vaisala frequency
+                         !CALL eos_rab_crs( tsn_crs, rab_crs_n )       ! now    local thermal/haline expension ratio at T-points
+                         !CALL bn2_crs    ( tsn_crs, rab_crs_n, rb2_crs  ) ! now    Brunt-Vaisala frequency
                          CALL eos_crs ( tsn_crs, rhd_crs, rhop_crs, gdept_crs(:,:,:) ) ! now in situ density for hpg computation
+                         CALL iom_put("rhop_crs",rhop_crs)
+                         CALL iom_put("rhd_crs",rhd_crs)
 
          IF( ln_zps )    CALL zps_hde_crs( kstp, jpts, tsb_crs, gtsu_crs, gtsv_crs, rhd_crs, gru_crs, grv_crs )
@@ -265 +277 @@
 
       IF( ln_crs_top )   CALL dom_grid_glo
+
 #endif