Changeset 6669

Timestamp:

2016-06-06T14:40:03+02:00 (8 years ago)

Author:

frrh

Message:

Corrections for compilation with MEDUSA branche which needs
associated changes to ensure relevant variables are publically available
and of the correct dimension.

File:

• branches/UKMO/dev_r5518_GSI7_GSI8_landice_bitcomp_medusa/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GSI7_GSI8_landice_bitcomp_medusa/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -51 +51 @@
    USE lib_fortran, ONLY: glob_sum
 #if defined key_medusa
-!   USE trc
-   USE trcbio_medusa, ONLY: f_co2flux2d, dms_surf2d
-   USE sms_medusa, ONLY: f_pco2a, dust
+   USE trcbio_medusa, ONLY: f_co2flux2d, dms_surf2d, f_pco2a
+   USE sms_medusa, ONLY: dust
 #endif
 
@@ -148 +147 @@
    INTEGER, PARAMETER ::   jps_sstfrz = 32            ! sea-surface freezing temperature
    INTEGER, PARAMETER ::   jps_fice1  = 33            ! first-order ice concentration (for time-travelling ice coupling)
-   INTEGER, PARAMETER ::   jpsnd      = 33            ! total number of fields sended
    INTEGER, PARAMETER ::   jps_bio_co2 = 34           ! MEDUSA air-sea CO2 flux in
    INTEGER, PARAMETER ::   jps_bio_dms = 35           ! MEDUSA DMS surface concentration in
@@ -2234 +2232 @@
 
 #if defined key_medusa
-      IF( ssnd(jps_bio_co2)%laction ) CALL cpl_prism_snd( jps_bio_co2, isec, f_co2flux2d, info )
+      IF( ssnd(jps_bio_co2)%laction ) CALL cpl_snd( jps_bio_co2, isec, f_co2flux2d, info )
 
       IF( ssnd(jps_bio_dms)%laction )  THEN
@@ -2240 +2238 @@
           ! the coupling space.
           ztmp1(:,: ) = dms_surf2d(:,:) * dms_unit_conv
-         CALL cpl_prism_snd( jps_bio_dms, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
+         CALL cpl_snd( jps_bio_dms, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
       ENDIF
 #endif