Changeset 15808

Timestamp:

2022-05-03T16:56:01+02:00 (2 years ago)

Author:

jpalmier

Message:

cpl fix -- define and alloc cpl var back in oce

Location:

NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5/src/OCE

Files:

• SBC/sbccpl.F90 (modified) (2 diffs)
• oce.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5/src/OCE/SBC/sbccpl.F90

@@ -32 +32 @@
    USE cpl_oasis3     ! OASIS3 coupling
    USE geo2ocean      ! 
-   USE oce     , ONLY : tsn, un, vn, sshn, ub, vb, sshb, fraqsr_1lev
+   USE oce     , ONLY : tsn, un, vn, sshn, ub, vb, sshb, fraqsr_1lev,  &
+                        CO2Flux_out_cpl, DMS_out_cpl, chloro_out_cpl,  &
+                        PCO2a_in_cpl, Dust_in_cpl
    USE ocealb         ! 
    USE eosbn2         ! 
@@ -51 +53 @@
    USE lbclnk         ! ocean lateral boundary conditions (or mpp link)
    USE timing         ! timing
-   USE sms_medusa, ONLY: CO2Flux_out_cpl, DMS_out_cpl, chloro_out_cpl, PCO2a_in_cpl, Dust_in_cpl
+!   USE sms_medusa, ONLY: CO2Flux_out_cpl, DMS_out_cpl, chloro_out_cpl, PCO2a_in_cpl, Dust_in_cpl
 
 #if defined key_oasis3 

NEMO/branches/UKMO/NEMO_4.0.4_MEDUSA_externals_GC5/src/OCE/oce.F90

@@ -68 +68 @@
    !! Energy budget of the leads (open water embedded in sea ice)
    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 :: chloro_out_cpl(:,:)   ! Output coupling chlorophyll 
+                                                                ! (expected in Kg/M3)  
+
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: PCO2a_in_cpl(:,:)     ! Input coupling CO2 partial pressure 
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE :: Dust_in_cpl(:,:)      ! Input coupling dust 
 
    !!----------------------------------------------------------------------
@@ -114 +125 @@
 #endif
          !
+#if defined key_oasis3 .AND. key_top
+         ! We only actually need these arrays to be allocated if coupling and MEDUSA 
+         ! are enabled
+         ! jpalm -- 03-05-2022 --
+         !       -- from NEMOv4, there is no more key_medusa, and ln_medusa is not yet read.
+         !          allocate if key_top and key_oasis3 (it is in MEDUSA branch so should be safe enough)
+         ALLOCATE( CO2Flux_out_cpl(jpi,jpj), DMS_out_cpl(jpi,jpj),               &
+                   chloro_out_cpl(jpi,jpj),                                      &
+                   PCO2a_in_cpl(jpi,jpj), Dust_in_cpl(jpi,jpj),     STAT=ierr(5) )
+#endif
+         !
       oce_alloc = MAXVAL( ierr )
       IF( oce_alloc /= 0 )   CALL ctl_stop( 'STOP', 'oce_alloc: failed to allocate arrays' )