Changeset 6792 for branches/NERC

Timestamp:

2016-07-06T13:39:13+02:00 (8 years ago)

Author:

jpalmier

Message:

update for coupling

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/OPA_SRC/oce.F90 (modified) (2 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -72 +72 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:)   ::   fraqsr_1lev        !: fraction of solar net radiation absorbed in the first ocean level [-]
 
-!! Arrays used in coupling when MEDUSA is present. These arrays need to be declared
-!! even if MEDUSA is not active, to allow compilation, in which case they will not be allocated.
-!! ---------------------
-REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: CO2Flux_out_cpl(:,:)   ! Output coupling CO2 flux 
-REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: DMS_out_cpl(:,:)       ! Output coupling DMS 
-REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: PCO2a_in_cpl(:,:)      ! Input coupling CO2 partial pressure
-REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: Dust_in_cpl(:,:)       ! Input coupling dust
-
-#if defined key_medusa
-LOGICAL, PUBLIC, PARAMETER :: ln_medusa=.TRUE.                ! Medusa switched on or off.
-#else
-LOGICAL, PUBLIC, PARAMETER :: ln_medusa=.FALSE.               ! Medusa switched on or off.
-#endif
    !!----------------------------------------------------------------------
    !! NEMO/OPA 4.0 , NEMO Consortium (2011)
@@ -132 +119 @@
       ALLOCATE( fraqsr_1lev(jpi,jpj) , STAT=ierr(4) )
          !
-#if defined key_oasis3
-      IF (ln_medusa) THEN
-         ! We only actually need these arrays to be allocated if coupling and MEDUSA
-         ! are enabled
-         ALLOCATE( CO2Flux_out_cpl(jpi,jpj),DMS_out_cpl(jpi,jpj),               &
-                   PCO2a_in_cpl(jpi,jpj), Dust_in_cpl(jpi,jpj),    STAT=ierr(5) )
-
-         ! RSRH Temporarily initialise output coupling fields while we await clarification
-         ! of exactly how these will be initialised at model startup!
-         DMS_out_cpl(:,:) = 0.0
-         CO2Flux_out_cpl(:,:) = 0.0
-      ENDIF
-#endif
       oce_alloc = MAXVAL( ierr )
       IF( oce_alloc /= 0 )   CALL ctl_warn('oce_alloc: failed to allocate arrays')