Changeset 7186

Timestamp:

2016-11-03T17:15:25+01:00 (7 years ago)

Author:

isabella

Message:

corrected output fields

File:

• branches/UKMO/dev_r5518_pcbias_ipc/NEMOGCM/NEMO/OPA_SRC/ASM/bias.F90 (modified) (6 diffs)

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

@@ -151 +151 @@
       & 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
+      & sbias_asm_stscale, &   !: Short time scale salinity bias field
+      & tbias_asm_stscale_out &   !: Short time scale temperature bias output field
+      & sbias_asm_stscale_out   !: Short time scale salinity bias output field
 
    INTEGER, PRIVATE :: nn_lat_ramp     ! choice of latitude dependent ramp
@@ -336 +338 @@
 
          IF( ln_incpc )    ALLOCATE(  tbias_asm_stscale(jpi,jpj,jpk), &
-            &                         sbias_asm_stscale(jpi,jpj,jpk))
+            &                         sbias_asm_stscale(jpi,jpj,jpk), &
+                                      tbias_asm_stscale_out(jpi,jpj,jpk), &
+                                      sbias_asm_stscale_out(jpi,jpj,jpk))
 
          lalloc = .TRUE.
@@ -648 +652 @@
                         &                - ( sbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
                      ENDDO
-
+                     
+                     IF ( kt == nn_bias_itwrt ) THEN
+                        DO jk = 1, jpk
+                           tbias_asm_stscale_out(:,:,jk) = ( t_bkginc(:,:,jk) * zwgt * ztfrac ) + ( tbias_asm_stscale(:,:,jk) * zfrac1 )
+                           sbias_asm_stscale_out(:,:,jk) = ( s_bkginc(:,:,jk) * zwgt * ztfrac ) + ( sbias_asm_stscale(:,:,jk) * zfrac1 )
+                        ENDDO
+                     ENDIF
                   ENDIF
 
@@ -671 +681 @@
                      END DO
 
-                     IF (ln_incpc) THEN
-                        DO jk = 1, jpk
-                           tbias_asm_stscale(:,:,jk) = ( t_bkginc(:,:,jk) * zwgt * ztfrac ) + ( tbias_asm_stscale(:,:,jk) * zfrac1 )
-                           sbias_asm_stscale(:,:,jk) = ( s_bkginc(:,:,jk) * zwgt * ztfrac ) + ( sbias_asm_stscale(:,:,jk) * zfrac1 )
-                        ENDDO
-                     ENDIF
+     
                   ENDIF
+
                
                ELSE ! decay pressure correction from combined historical component and increments after IAU
@@ -706 +712 @@
                       &                - ( sbias_asm_stscale(:,:,jk) * zfrac1 * (1.0 - fbcoef_stscale(:,:)) )
                    ENDDO
+
+                   IF ( kt == nn_bias_itwrt ) THEN
+                      DO jk = 1, jpk
+                         tbias_asm_stscale_out(:,:,jk) = ( t_bkginc(:,:,jk) * zwgt * zfrac ) + ( tbias_asm_stscale(:,:,jk) * zfrac1 )
+                         sbias_asm_stscale_out(:,:,jk) = ( s_bkginc(:,:,jk) * zwgt * zfrac ) + ( sbias_asm_stscale(:,:,jk) * zfrac1 )
+                      ENDDO
+                   ENDIF
 
                  ENDIF
@@ -973 +986 @@
 
       IF ( ln_incpc ) THEN
-         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'tbias_asm_stscale' , tbias_asm_stscale )   
-         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_asm_stscale' , sbias_asm_stscale )   
+         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'tbias_asm_stscale' , tbias_asm_stscale_out )   
+         CALL iom_rstput( nn_bias_itwrt, nn_bias_itwrt, numbias_tot, 'sbias_asm_stscale' , sbias_asm_stscale_out )   
       ENDIF