Changeset 6744 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC

Timestamp:

2016-06-27T18:21:18+02:00 (8 years ago)

Author:

jpalmier

Message:

JPALM --27-06-2016 -- Update MEDUSA-atm coupling

Location:

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC

Files:

• MEDUSA/trcbio_medusa.F90 (modified) (6 diffs)
• MEDUSA/trcsed_medusa.F90 (modified) (2 diffs)
• trcrst.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

@@ -91 +91 @@
       USE, INTRINSIC :: ieee_arithmetic 
 
+      !! JPALM (27-06-2016): add lk_oasis for CO2 and DMS coupling with atm
+      USE sbc_oce, ONLY: lk_oasis
+      USE oce,     ONLY: CO2Flux_out_cpl, DMS_out_cpl, PCO2a_in_cpl
+
       IMPLICIT NONE
       PRIVATE
@@ -320 +324 @@
       !! AXY (13/03/15): add in other DMS calculations
       REAL(wp) ::    dms_andr, dms_simo, dms_aran, dms_hall
-#  if defined key_oasis3
-      REAL(wp), DIMENSION(jpi,jpj) :: pco2a_2d(ji,jj)        !! use 2D atm pCO2 from atm coupling
-#  endif
 
 # endif
@@ -1051 +1052 @@
                   !! OPEN wet point IF..THEN loop
                   if (tmask(ji,jj,jk).eq.1) then
-#  if defined key_oasis3
-                     f_pco2a = pco2a_2d(ji,jj)        !! use 2D atm pCO2 from atm coupling
-#  endif
+                     IF (lk_oasis) THEN
+                        f_pco2a = PCO2a_in_cpl(ji,jj)        !! use 2D atm pCO2 from atm coupling
+                     ENDIF
                      !! do carbonate chemistry
                      !!
@@ -1383 +1384 @@
                   !!
                   f_wind  = wndm(ji,jj)
-#  if defined key_oasis3
-                  f_pco2a = pco2a_2d(ji,jj)        !! use 2D atm pCO2 from atm coupling
-#  endif
-
+                  IF (lk_oasis) THEN
+                     f_pco2a = PCO2a_in_cpl(ji,jj)        !! use 2D atm pCO2 from atm coupling
+                  ENDIF
                   !!
                   !! AXY (23/06/15): as part of an effort to update the carbonate chemistry
@@ -4356 +4356 @@
                      ENDIF
                      IF( med_diag%CO2FLUX%dgsave ) THEN
+                         CALL lbc_lnk(f_co2flux2d(:,:),'T',1. )
                          CALL iom_put( "CO2FLUX"  , f_co2flux2d )
                          zb_co2_flx = zn_co2_flx
                          zn_co2_flx = f_co2flux2d
+                         IF (lk_oasis) THEN
+                            CO2Flux_out_cpl = zn_co2_flx
+                         ENDIF
                          CALL wrk_dealloc( jpi, jpj,   f_co2flux2d   )
                      ENDIF
@@ -4399 +4403 @@
                      IF (jdms .eq. 1) THEN
                        IF( med_diag%DMS_SURF%dgsave ) THEN
+                         CALL lbc_lnk(dms_surf2d(:,:),'T',1. )
                          CALL iom_put( "DMS_SURF"  , dms_surf2d )
                          zb_dms_srf = zn_dms_srf
                          zn_dms_srf = dms_surf2d
+                         IF (lk_oasis) THEN
+                            DMS_out_cpl = zn_dms_srf
+                         ENDIF
                          CALL wrk_dealloc( jpi, jpj,   dms_surf2d   ) 
                        ENDIF

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcsed_medusa.F90

@@ -28 +28 @@
    USE lbclnk
    USE prtctl_trc      ! Print control for debbuging
+   !! JPALM (27-06-2016): add lk_oasis for CO2 and DMS coupling with atm
+   USE sbc_oce, ONLY: lk_oasis
+   USE oce,     ONLY: Dust_in_cpl
+
 
    IMPLICIT NONE
@@ -147 +151 @@
             dust(:,:) = sf_dust(1)%fnow(:,:,1)
          ENDIF
+      ELSEIF (lk_oasis) THEN
+         dust = Dust_in_cpl
       ELSE
          dust(:,:) = 0.0

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/trcrst.F90

@@ -41 +41 @@
 #endif
    USE lbclnk          ! ocean lateral boundary conditions (or mpp link)
+   USE oce,    ONLY: CO2Flux_out_cpl, DMS_out_cpl  !! Coupling variable
 
    IMPLICIT NONE
@@ -251 +252 @@
          zn_dms_srf(:,:)  = 0.0
       ENDIF
+      IF (lk_oasis) THEN
+         DMS_out_cpl(:,:) = zn_dms_srf(:,:)        !! Coupling variable
+      END IF
       !!
       IF( iom_varid( numrtr, 'B_CO2_flx', ldstop = .FALSE. ) > 0 ) THEN
@@ -261 +265 @@
          zn_co2_flx(:,:)  = 0.0
       ENDIF
+      IF (lk_oasis) THEN
+         CO2Flux_out_cpl(:,:) =  zn_co2_flx(:,:)   !! Coupling variable
+      END IF
       !!
       !! calculate stats on these fields