Changeset 6196 for branches/UKMO/dev_r5518_pkg/NEMOGCM/NEMO

Timestamp:

2016-01-04T10:31:06+01:00 (8 years ago)

Author:

frrh

Message:

Remove mysterious "trunk" content which seems to have appeared for
reasons unknown.

File:

• branches/UKMO/dev_r5518_pkg/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (6 diffs)

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

@@ -53 +53 @@
 #endif
 #if defined key_medusa
-   USE trc
+! RSRH Temporarily commented out until we get MEDUSA code   USE trc
 #endif
+
+
+
 
    IMPLICIT NONE
@@ -159 +162 @@
    END TYPE FLD_C
    ! Send to the atmosphere                           !
-   TYPE(FLD_C) ::   sn_snd_temp, sn_snd_alb, sn_snd_thick, sn_snd_crt, sn_snd_co2  
+   TYPE(FLD_C) ::   sn_snd_temp, sn_snd_alb, sn_snd_thick, sn_snd_crt, sn_snd_co2, sn_snd_cond, sn_snd_mpnd, sn_snd_sstfrz, sn_snd_thick1
    TYPE(FLD_C) ::   sn_snd_bio_co2, sn_snd_bio_dms                       
    ! Received from the atmosphere                     !
    TYPE(FLD_C) ::   sn_rcv_w10m, sn_rcv_taumod, sn_rcv_tau, sn_rcv_dqnsdt, sn_rcv_qsr, sn_rcv_qns, sn_rcv_emp, sn_rcv_rnf
-   TYPE(FLD_C) ::   sn_rcv_cal, sn_rcv_iceflx, sn_rcv_co2
+   TYPE(FLD_C) ::   sn_rcv_cal, sn_rcv_iceflx, sn_rcv_co2, sn_rcv_ts_ice, sn_rcv_grnm, sn_rcv_antm
    TYPE(FLD_C) ::   sn_rcv_atm_pco2, sn_rcv_atm_dust                         
    ! Other namelist parameters                        !
@@ -178 +181 @@
 
    INTEGER , ALLOCATABLE, SAVE, DIMENSION(    :) ::   nrcvinfo           ! OASIS info argument
+
 
    !! Substitution
@@ -1890 +1894 @@
       REAL(wp), POINTER, DIMENSION(:,:)   ::   zfr_l, ztmp1, ztmp2, zotx1, zoty1, zotz1, zitx1, zity1, zitz1
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   ztmp3, ztmp4   
+
+#if defined key_medusa
+! RSRH Temporarily definitition of array used in medusa coupling until we actually have the medusa code included in the build
+   REAL(wp)  ::  TRC2D_TEST(jpi,jpj)
+#endif
+
       !!----------------------------------------------------------------------
       !
@@ -2041 +2051 @@
 !! May add also a coupling MED-UKCA key
 
+
+#if defined key_medusa
       ! RSRH. We don't want to use magic numbers in the code (i.e. 98 and 221).
       ! These need moving to a parameter statement (as part of MEDUSA code) or even specifying in a namelist
       ! so the following code MUST NOT be viewed as anything more than temporary.
-      IF( ssnd(jps_bio_co2)%laction )   CALL cpl_prism_snd( jps_bio_co2, isec, trc2d(:,:,98:98), info )
+!      IF( ssnd(jps_bio_co2)%laction )   CALL cpl_prism_snd( jps_bio_co2, isec, trc2d(:,:,98:98), info )
+      TRC2D_TEST(:,:) = 0.0
+      IF( ssnd(jps_bio_co2)%laction )   CALL cpl_prism_snd( jps_bio_co2, isec, trc2d_TEST(:,:), 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(:,: ) = trc2d(:,:,221) * dms_unit_conv
+!         ztmp1(:,: ) = trc2d(:,:,221) * dms_unit_conv
+         ztmp1(:,: ) = trc2d_TEST(:,:) * dms_unit_conv
          CALL cpl_prism_snd( jps_bio_dms, isec, RESHAPE ( ztmp1, (/jpi,jpj,1/) ), info )
       ENDIF
-
+#endif
       !                                                      ! ------------------------- !
       IF( ssnd(jps_ocx1)%laction ) THEN                      !      Surface current      !
@@ -2155 +2170 @@
                                 &                  + v_ice(ji-1,jj  ) + v_ice(ji,jj  )  ) *  fr_i(ji,jj)
                        END DO
+                     END DO
 #if defined key_cice
                   ELSE