Changeset 7154

Timestamp:

2016-10-28T11:16:33+02:00 (7 years ago)

Author:

isabella

Message:

storing the incremental pressure correction in a different variable so that the output will be easier

Location:

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM

Files:

• bias.F90 (modified) (10 diffs)
• biaspar.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90

@@ -148 +148 @@
       & tbias_p_out,   &   !: Output temperature bias field for P correction
       & sbias_p_out,   &   !: Output salinity bias field for P correction
+      & tbias_i_out,   &   !: Output temperature bias field for incremental P correction
+      & sbias_i_out,   &   !: Output salinity bias field for incremental P correction
       & tbias_asm_stscale, &   !: Short time scale temperature bias field
       & sbias_asm_stscale      !: Short time scale salinity bias field
@@ -311 +313 @@
             &      tbias_p(jpi,jpj,jpk), &
             &      sbias_p(jpi,jpj,jpk), &
+            &      tbias_i(jpi,jpj,jpk), &
+            &      sbias_i(jpi,jpj,jpk), &
             &      rhd_pc(jpi,jpj,jpk) , &
             &      gru_pc(jpi,jpj)     , &
@@ -322 +326 @@
                                       sbias_asm_out(jpi,jpj,jpk), &  
                                       tbias_p_out(jpi,jpj,jpk),   &              
-                                      sbias_p_out(jpi,jpj,jpk)    )
+                                      sbias_p_out(jpi,jpj,jpk),   &
+                                      tbias_i_out(jpi,jpj,jpk),   &  
+                                      sbias_i_out(jpi,jpj,jpk)   )
 
          IF( ln_bias_rlx ) ALLOCATE(  tbias_rlx(jpi,jpj,jpk),     &
@@ -370 +376 @@
          tbias_p(:,:,:) = 0.0_wp
          sbias_p(:,:,:) = 0.0_wp
+         tbias_i(:,:,:) = 0.0_wp
+         sbias_i(:,:,:) = 0.0_wp
          gru_pc(:,:)    = 0.0_wp
          grv_pc(:,:)    = 0.0_wp
@@ -579 +587 @@
       tbias_p(:,:,:) = 0.0_wp
       sbias_p(:,:,:) = 0.0_wp
+      tbias_i(:,:,:) = 0.0_wp
+      sbias_i(:,:,:) = 0.0_wp
 
       ztscale = 0.1_wp
@@ -633 +643 @@
 
                      DO jk = 1, jpkm1
-                        tbias_p(:,:,jk) = tbias_p(:,:,jk) + ( t_bkginc(:,:,jk) * zwgt * ztfrac * (1.0 - fbcoef_stscale(:,:)) )         &
+                        tbias_i(:,:,jk) =  ( t_bkginc(:,:,jk) * zwgt * ztfrac * (1.0 - fbcoef_stscale(:,:)) )         &
                         &                - ( tbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
-                        sbias_p(:,:,jk) = sbias_p(:,:,jk) + ( s_bkginc(:,:,jk) * zwgt * ztfrac * (1.0 - fbcoef_stscale(:,:)) )         &
+                        sbias_i(:,:,jk) =  ( s_bkginc(:,:,jk) * zwgt * ztfrac * (1.0 - fbcoef_stscale(:,:)) )         &
                         &                - ( sbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
                      ENDDO
@@ -684 +694 @@
                    
                    DO jk = 1, jpkm1
-                      tbias_p(:,:,jk) = tbias_p(:,:,jk) + ( t_bkginc(:,:,jk) * zwgt * zfrac * (1.0 - fbcoef_stscale(:,:)) )         &
+                      tbias_i(:,:,jk) = ( t_bkginc(:,:,jk) * zwgt * zfrac * (1.0 - fbcoef_stscale(:,:)) )         &
                       &                - ( tbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
-                      sbias_p(:,:,jk) = sbias_p(:,:,jk) + ( s_bkginc(:,:,jk) * zwgt * zfrac * (1.0 - fbcoef_stscale(:,:)) )         &
+                      sbias_i(:,:,jk) =  ( s_bkginc(:,:,jk) * zwgt * zfrac * (1.0 - fbcoef_stscale(:,:)) )         &
                       &                - ( sbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
                    ENDDO
@@ -819 +829 @@
          tbias_p_out(:,:,:)   = tbias_p(:,:,:)
          sbias_p_out(:,:,:)   = sbias_p(:,:,:)
+         tbias_i_out(:,:,:)   = tbias_i(:,:,:)
+         sbias_i_out(:,:,:)   = sbias_i(:,:,:)
       ENDIF
 
@@ -860 +872 @@
          tsw(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) - tbias_p(:,:,:)
          tsw(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) - sbias_p(:,:,:)
+         IF ( ln_incpc ) THEN
+            tsw(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) - sbias_p(:,:,:) - sbias_i(:,:,:)
+            tsw(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) - tbias_p(:,:,:) - tbias_i(:,:,:)
+         ENDIF
       ELSE
          tsw(:,:,:,jp_tem) = tsb(:,:,:,jp_tem) - tbias_p(:,:,:)
          tsw(:,:,:,jp_sal) = tsb(:,:,:,jp_sal) - sbias_p(:,:,:)
+            IF ( ln_incpc ) THEN
+               tsw(:,:,:,jp_sal) = tsa(:,:,:,jp_sal) - sbias_p(:,:,:) - sbias_i(:,:,:)
+               tsw(:,:,:,jp_tem) = tsa(:,:,:,jp_tem) - tbias_p(:,:,:) - tbias_i(:,:,:)
+            ENDIF
       ENDIF
 
@@ -940 +960 @@
          CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_asm' , sbias_asm_out )   
          CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'tbias_p'   , tbias_p_out )
-         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_p'   , sbias_p_out )         
+         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_p'   , sbias_p_out )
+         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'tbias_i'   , tbias_i_out )
+         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_i'   , sbias_i_out )          
       ENDIF
 

branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/biaspar.F90

@@ -27 +27 @@
       & tbias, &       !: Temperature bias field for T correction
       & tbias_p, &     !:  "           "    "    "   P correction
+      & tbias_i, &     !:  "           "    "    "   incremental P correction
       & sbias, &       !: Salinity bias field    for S correction
       & sbias_p, &     !:  "           "    "    "   P correction
+      & sbias_i, &     !:  "           "    "    "   incremental P correction
       & rhd_pc         !: Press corrtd density from online to use in dyn_hpg