Changeset 10141 for branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90

Timestamp:

2018-09-19T17:14:46+02:00 (6 years ago)

Author:

dford

Message:

Change cpp key key_foam_medusa to a logical switch ln_foam_medusa.

File:

• branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90 (modified) (7 diffs)

branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3/NEMOGCM/NEMO/TOP_SRC/MEDUSA/sms_medusa.F90

@@ -212 +212 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   :: f2_ccd_arg  !: 2D aragonite CCD depth
 !!
-#if defined key_foam_medusa
 !! 2D fields of pCO2 and fCO2 for observation operator
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   :: f2_pco2w    !: 2D pCO2
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   :: f2_fco2w    !: 2D fCO2
 !!
-#endif
 !! 2D fields of organic and inorganic material sedimented on the seafloor
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   :: zb_sed_n    !: 2D organic nitrogen   (before)
@@ -295 +293 @@
    INTEGER  :: co2_rec
    REAL(wp) :: co2_yinit, co2_yend    !: First and Last year read in the xCO2.atm file
+   REAL(wp) :: xobs_xco2a             !: Observed atmospheric xCO2, from namelist
 #endif
 
@@ -305 +304 @@
 #else
    LOGICAL , PUBLIC ::   lk_pi_co2 = .FALSE. !: PI xCO2 unused
-# if defined key_foam_medusa
-   REAL(wp) ::   xobs_xco2a   !: Observed atmospheric xCO2, read in
-# endif
 #endif
 
@@ -358 +354 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:)   :: cmask       !: ???
 
-#if defined key_foam_medusa
 !!----------------------------------------------------------------------
 !! Parameters required for ocean colour assimilation
 !!----------------------------------------------------------------------
 !!
+   LOGICAL :: ln_foam_medusa                                 !: Flag to calculate and save diagnostics
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: pgrow_avg  !: Mixed layer average phytoplankton growth
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: ploss_avg  !: Mixed layer average phytoplankton loss
@@ -368 +364 @@
    REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:) :: mld_max    !: Maximum mixed layer depth
 !!
-#endif
 
    !!----------------------------------------------------------------------
@@ -392 +387 @@
       !* 2D and 3D fields of carbonate system parameters
       ALLOCATE( f2_ccd_cal(jpi,jpj)  , f2_ccd_arg(jpi,jpj)  ,       &
-#  if defined key_foam_medusa
                 f2_pco2w(jpi,jpj)    , f2_fco2w(jpi,jpj)    ,       &
-#  endif
          &      f3_pH(jpi,jpj,jpk)   , f3_h2co3(jpi,jpj,jpk),       &
          &      f3_hco3(jpi,jpj,jpk) , f3_co3(jpi,jpj,jpk)  ,       &
@@ -443 +436 @@
          &      ffln(jpi,jpj,jpk)    , fflf(jpi,jpj,jpk)    ,       &
          &      ffls(jpi,jpj,jpk)    , cmask(jpi,jpj)       ,    STAT=ierr(8) ) 
-# if defined key_foam_medusa
+      !* Fields for ocean colour data assimilation
       ALLOCATE( pgrow_avg(jpi,jpj)   , ploss_avg(jpi,jpj)   ,       &
          &      phyt_avg(jpi,jpj)    , mld_max(jpi,jpj)     ,    STAT=ierr(9) )
-# endif
 #endif
       !