Changeset 6278

Timestamp:

2016-02-03T11:05:58+01:00 (8 years ago)

Author:

jenniewaters

Message:

Include the bias pressure correction code at vn3.6.

Location:

branches/UKMO/dev_r5518_pcbias/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (1 diff)
• NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (4 diffs)
• NEMO/OPA_SRC/IOM/in_out_manager.F90 (modified) (1 diff)
• NEMO/OPA_SRC/nemogcm.F90 (modified) (1 diff)
• NEMO/OPA_SRC/step.F90 (modified) (5 diffs)
• NEMO/OPA_SRC/step_oce.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_pcbias/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -1299 +1299 @@
    rn_htrmax         =  200.0   ! max. depth of transition range
 /
+!-----------------------------------------------------------------------
+&nambias   ! Bias pressure correctiom
+!-----------------------------------------------------------------------
+   ln_bias = .false.
+   ln_bias_asm    = .false.
+   ln_bias_rlx    = .false.
+   ln_bias_ofl    = .false.
+   ln_bias_ts_app = .false.
+   ln_bias_pc_app = .false.
+   eft_asm        = 90.    
+   cn_bias_tot    = 'pcbias.nc'
+   bias_time_unit_asm = 86400.0
+   ln_inertial    = .false.
+/

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -44 +44 @@
    USE wrk_nemo        ! Memory Allocation
    USE timing          ! Timing
+   USE biaspar         ! bias correction variables
 
    IMPLICIT NONE
@@ -84 +85 @@
       INTEGER, INTENT(in) ::   kt   ! ocean time-step index
       REAL(wp), POINTER, DIMENSION(:,:,:) ::  ztrdu, ztrdv
+      REAL(wp), DIMENSION(jpi,jpj,jpk) ::   z_rhd_st       ! for pressure correction
+      REAL(wp), DIMENSION(jpi,jpj)     ::   z_gru_st       ! for pressure correction
+      REAL(wp), DIMENSION(jpi,jpj)     ::   z_grv_st       ! for pressure correction
       !!----------------------------------------------------------------------
       !
@@ -92 +96 @@
          ztrdu(:,:,:) = ua(:,:,:)
          ztrdv(:,:,:) = va(:,:,:)
+      ENDIF
+      !
+      IF ( ln_bias .AND. ln_bias_pc_app ) THEN
+         z_rhd_st(:,:,:) = rhd(:,:,:)     ! store orig density 
+         rhd(:,:,:)      = rhd_pc(:,:,:)  ! use pressure corrected density
+         z_gru_st(:,:)   = gru(:,:)
+         gru(:,:)        = gru_pc(:,:)
+         z_grv_st(:,:)   = grv(:,:)
+         grv(:,:)        = grv_pc(:,:)
       ENDIF
       !
@@ -112 +125 @@
       IF(ln_ctl)   CALL prt_ctl( tab3d_1=ua, clinfo1=' hpg  - Ua: ', mask1=umask,   &
          &                       tab3d_2=va, clinfo2=       ' Va: ', mask2=vmask, clinfo3='dyn' )
+      !
+      IF ( ln_bias .AND. ln_bias_pc_app )  THEN
+         rhd(:,:,:) = z_rhd_st(:,:,:)     ! restore original density
+         gru(:,:)   = z_gru_st(:,:)
+         grv(:,:)   = z_grv_st(:,:)
+      ENDIF
       !
       IF( nn_timing == 1 )  CALL timing_stop('dyn_hpg')

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/IOM/in_out_manager.F90

@@ -121 +121 @@
    INTEGER ::   numout          =    6      !: logical unit for output print; Set to stdout to ensure any early
                                             !  output can be collected; do not change
+   INTEGER ::   numnam          =   -1      !: logical unit for namelist
    INTEGER ::   numnam_ref      =   -1      !: logical unit for reference namelist
    INTEGER ::   numnam_cfg      =   -1      !: logical unit for configuration specific namelist

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -452 +452 @@
       IF( lk_diadct     )   CALL dia_dct_init   ! Sections tranports
                             CALL dia_hsb_init   ! heat content, salt content and volume budgets
-                            CALL     trd_init   ! Mixed-layer/Vorticity/Integral constraints trends
+                            CALL     trd_init   ! Mixed-layer/Vorticity/Integral constraints trend
+      IF (lk_bias       )   CALL     bias_init  ! Pressure correction bias
       IF( lk_diaobs     ) THEN                  ! Observation & model comparison
                             CALL dia_obs_init            ! Initialize observational data

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -97 +97 @@
       IF( ln_crs     )       CALL iom_setkt( kstp - nit000 + 1, TRIM(cxios_context)//"_crs" )   ! tell iom we are at time step kstp
 
+      IF( lk_bias ) THEN
+         IF( ln_bias )          CALL bias_opn( kstp )
+      ENDIF
+
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
       ! Update data, open boundaries, surface boundary condition (including sea-ice)
@@ -255 +259 @@
       IF( lk_trabbl      )   CALL tra_bbl    ( kstp )       ! advective (and/or diffusive) bottom boundary layer scheme
       IF( ln_tradmp      )   CALL tra_dmp    ( kstp )       ! internal damping trends
+      IF( lk_bias  ) THEN
+         IF( ln_bias     )   CALL tra_bias   ( kstp )
+      ENDIF
       IF( lk_bdy         )   CALL bdy_tra_dmp( kstp )       ! bdy damping trends
                              CALL tra_adv    ( kstp )       ! horizontal & vertical advection
@@ -279 +286 @@
                &                                           rhd, gru , grv , aru , arv , gzu , gzv , ge3ru , ge3rv ,   &
                &                                    gtui, gtvi, grui, grvi, arui, arvi, gzui, gzvi, ge3rui, ge3rvi    ) ! of t, s, rd at the last ocean level
+            IF( lk_bias  ) THEN
+               IF( ln_bias ) CALL dyn_bias( kstp )
+            ENDIF
       ELSE                                                  ! centered hpg  (eos then time stepping)
          IF ( .NOT. lk_dynspg_ts ) THEN                     ! eos already called in time-split case
@@ -293 +303 @@
          IF( ln_zdfnpc   )   CALL tra_npc( kstp )                ! update after fields by non-penetrative convection
                              CALL tra_nxt( kstp )                ! tracer fields at next time step
+         IF( lk_bias  ) THEN
+            IF( ln_bias ) CALL dyn_bias( kstp )
+         ENDIF
       ENDIF
 
@@ -353 +366 @@
       ENDIF
       IF( lrst_oce         )   CALL rst_write    ( kstp )   ! write output ocean restart file
+      IF( lk_bias  ) THEN
+         IF( lrst_bias )       CALL bias_wrt     ( kstp )
+      ENDIF
 
       !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

branches/UKMO/dev_r5518_pcbias/NEMOGCM/NEMO/OPA_SRC/step_oce.F90

@@ -99 +99 @@
 
    USE crsfld           ! Standard output on coarse grid   (crs_fld routine)
-
+   USE biaspar          ! bias param
+   USE bias             ! bias routines                    (tra_bias routine
+                        !                                   dyn_bias routine)
    USE asminc           ! assimilation increments      (tra_asm_inc routine)
    !                                                   (dyn_asm_inc routine)