Changeset 8440 for branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2017-08-16T14:47:00+02:00 (7 years ago)

Author:

dford

Message:

Add more variables to assimilation background, so it includes all required elements of the background state.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6_package_asm_surf_bgc/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -346 +346 @@
 #  endif
 # endif
-# if defined key_foam_medusa
-      !! Fields for ocean colour assimilation on first timestep
-      IF( iom_varid( numrtr, 'pgrow_avg', ldstop = .FALSE. ) > 0 ) THEN
-         IF(lwp) WRITE(numout,*) ' MEDUSA pgrow_avg present - reading in ...'
-         CALL iom_get( numrtr, jpdom_autoglo, 'pgrow_avg',  pgrow_avg(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'ploss_avg',  ploss_avg(:,:)  )
-         CALL iom_get( numrtr, jpdom_autoglo, 'phyt_avg',   phyt_avg(:,:)   )
-         CALL iom_get( numrtr, jpdom_autoglo, 'mld_max',    mld_max(:,:)    )
-      ELSE
-         IF(lwp) WRITE(numout,*) ' MEDUSA pgrow_avg absent - setting to zero ...'
-         pgrow_avg(:,:) = 0.0
-         ploss_avg(:,:) = 0.0
-         phyt_avg(:,:)  = 0.0
-         mld_max(:,:)   = 0.0
-      ENDIF
-# endif
 
 
@@ -530 +514 @@
       call trc_rst_dia_stat( f2_ccd_arg(:,:),'CCD_ARG')
       !!
-# endif
-# if defined key_foam_medusa
-      !! Fields for assimilation and observation operator on first timestep
-      IF(lwp) WRITE(numout,*) ' MEDUSA OBS/ASM fields - writing out ...'
-#  if defined key_roam
-      CALL iom_rstput( kt, nitrst, numrtw, 'PCO2W',     f2_pco2w(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'FCO2W',     f2_fco2w(:,:)  )
+#  if defined key_foam_medusa
+      !! Fields for observation operator on first timestep
+      IF(lwp) WRITE(numout,*) ' MEDUSA OBS fields - writing out ...'
+      CALL iom_rstput( kt, nitrst, numrtw, 'PCO2W', f2_pco2w(:,:)  )
+      CALL iom_rstput( kt, nitrst, numrtw, 'FCO2W', f2_fco2w(:,:)  )
 #  endif
-      CALL iom_rstput( kt, nitrst, numrtw, 'pgrow_avg', pgrow_avg(:,:) )
-      CALL iom_rstput( kt, nitrst, numrtw, 'ploss_avg', ploss_avg(:,:) )
-      CALL iom_rstput( kt, nitrst, numrtw, 'phyt_avg',  phyt_avg(:,:)  )
-      CALL iom_rstput( kt, nitrst, numrtw, 'mld_max',   mld_max(:,:)   )
 # endif
 !!