Changeset 6681 for branches/UKMO/dev_r5518_GSI7_GSI8_landice_bitcomp_medusa/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

Timestamp:

2016-06-10T12:26:35+02:00 (8 years ago)

Author:

frrh

Message:

Add changes for compatibility with main MEDUSA branch and to enable
coupling of true DMS, CO2 flux, CO2 from atmos and Dust from atmos.

This places responsibility for populating outgoing arrays and
employing incoming arrays on the MEDUSA branch rather than the
coupling interface branch.

NOTE: This revision contains a temporary fix for testing
to ensure coupling fields are initialised in the absence of
a clear mechanism for obtaining initial start-up values. Remove
the lines labelled RSRH in oce.F90 when this is resolved in the
MEDUSA code.

File:

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

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

@@ -33 +33 @@
    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, PCO2a_in_cpl, Dust_in_cpl, &
+                      ln_medusa
    USE albedo          !
    USE in_out_manager  ! I/O manager
@@ -527 +529 @@
       srcv(jpr_atm_pco2)%clname = 'OATMPCO2'
 
-      IF (TRIM(sn_rcv_atm_pco2%cldes) == 'coupled') THEN
+      IF (TRIM(sn_rcv_atm_pco2%cldes) == 'medusa') THEN
         srcv(jpr_atm_pco2)%laction = .TRUE.
       END IF
                
       srcv(jpr_atm_dust)%clname = 'OATMDUST'   
-      IF (TRIM(sn_rcv_atm_dust%cldes) == 'coupled')  THEN
+      IF (TRIM(sn_rcv_atm_dust%cldes) == 'medusa')  THEN
         srcv(jpr_atm_dust)%laction = .TRUE.
       END IF
@@ -812 +814 @@
       ssnd(jps_co2)%clname = 'O_CO2FLX' ;  IF( TRIM(sn_snd_co2%cldes) == 'coupled' )    ssnd(jps_co2 )%laction = .TRUE.
       !
+
+      !                                                      ! ------------------------- !
+      !                                                      !   MEDUSA output fields    !
+      !                                                      ! ------------------------- !
+      ssnd(jps_co2)%clname = 'O_CO2FLX' 
+      ssnd(jps_bio_dms)%clname = 'OBioDMS'   
+      IF( TRIM(sn_snd_bio_dms%cldes) == 'medusa' )    ssnd(jps_bio_dms )%laction = .TRUE.
+
+      ssnd(jps_bio_co2)%clname = 'OBioCO2'   
+      IF( TRIM(sn_snd_bio_co2%cldes) == 'medusa' )    ssnd(jps_bio_co2 )%laction = .TRUE.
       
       !                                                      ! ------------------------- !
@@ -1176 +1188 @@
       ENDIF
 
-#if defined key_medusa
-      ! RSRH Allocate temporary arrays to receive incoming fields during testing
-      ALLOCATE(atm_pco2(jpi,jpj))
-      ALLOCATE(atm_dust(jpi,jpj))
-
-      IF( srcv(jpr_atm_pco2)%laction) atm_pco2(:,:) = frcv(jpr_atm_pco2)%z3(:,:,1)
-      IF( srcv(jpr_atm_dust)%laction) atm_dust(:,:) = frcv(jpr_atm_dust)%z3(:,:,1)
-     
-      ! RSRH Deallocate temporary arrays.
-      DEALLOCATE(atm_pco2)
-      DEALLOCATE(atm_dust)
-#endif
+      IF (ln_medusa) THEN
+        IF( srcv(jpr_atm_pco2)%laction) PCO2a_in_cpl(:,:) = frcv(jpr_atm_pco2)%z3(:,:,1)
+        IF( srcv(jpr_atm_dust)%laction) Dust_in_cpl(:,:) = frcv(jpr_atm_dust)%z3(:,:,1)
+      ENDIF
 
 #if defined key_cpl_carbon_cycle
@@ -2231 +2235 @@
 
 
-#if defined key_medusa
-      IF( ssnd(jps_bio_co2)%laction ) CALL cpl_snd( jps_bio_co2, isec, RESHAPE( f_co2flux2d, (/jpi,jpj,1/) ), info )
-
-      IF( ssnd(jps_bio_dms)%laction )  THEN
-          ! We need to multiply DMS by a conversion factor to get values in the standard units expected in
-          ! the coupling space.
-          ztmp1(:,: ) = dms_surf2d(:,:) * dms_unit_conv
-         CALL cpl_snd( jps_bio_dms, isec, RESHAPE( ztmp1, (/jpi,jpj,1/) ), info )
-      ENDIF
-#endif
+      IF (ln_medusa) THEN
+      !                                                      ! --------------------------------- !
+      !                                                      !  CO2 flux and DMS from MEDUSA     ! 
+      !                                                      ! --------------------------------- !
+         IF ( ssnd(jps_bio_co2)%laction ) THEN
+            CALL cpl_snd( jps_bio_co2, isec, RESHAPE( CO2Flux_out_cpl, (/jpi,jpj,1/) ), info )
+         ENDIF
+
+         IF ( ssnd(jps_bio_dms)%laction )  THEN
+            CALL cpl_snd( jps_bio_dms, isec, RESHAPE( DMS_out_cpl, (/jpi,jpj,1/) ), info )
+         ENDIF
+      ENDIF
 
       !                                                      ! ------------------------- !