Changeset 8202 for branches

Timestamp:

2017-06-21T16:41:26+02:00 (7 years ago)

Author:

frrh

Message:

Merge branches/UKMO/dev_r5518_couple_chlorophyll@8136 using:

svn merge -r 7999:8136 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_couple_chlorophyll

Location:

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM

Files:

• CONFIG/SHARED/namelist_ref (modified) (2 diffs)
• NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (9 diffs)
• NEMO/OPA_SRC/oce.F90 (modified) (2 diffs)

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/CONFIG/SHARED/namelist_ref

@@ -363 +363 @@
    sn_snd_crt    =       'none'                 ,    'no'    , 'spherical' , 'eastward-northward' ,  'T'
    sn_snd_co2    =       'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_bio_co2 =      'medusa'               ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_bio_dms =      'medusa'               ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_bio_chloro =   'medusa'               ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_cond   =       'weighted ice'         ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_mpnd   =       'ice only'             ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_sstfrz =       'coupled'              ,    'no'    ,     ''      ,         ''           ,   ''
+   sn_snd_thick1 =       'ice and snow'         ,    'no'    ,     ''      ,         ''           ,   ''
 ! receive
    sn_rcv_w10m   =       'none'                 ,    'no'    ,     ''      ,         ''          ,   ''
@@ -374 +381 @@
    sn_rcv_cal    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
    sn_rcv_co2    =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_antm   =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_grnm   =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_iceflx =       'coupled'              ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_ts_ice =       'ice'                  ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_atm_dust =     'medusa'               ,    'no'    ,     ''      ,         ''          ,   ''
+   sn_rcv_atm_pco2 =     'medusa'               ,    'no'    ,     ''      ,         ''          ,   ''
+
 !
    nn_cplmodel   =     1     !  Maximum number of models to/from which NEMO is potentialy sending/receiving data

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

@@ -34 +34 @@
    USE geo2ocean       ! 
    USE oce   , ONLY : tsn, un, vn, sshn, ub, vb, sshb, fraqsr_1lev,            &
-                      CO2Flux_out_cpl, DMS_out_cpl, PCO2a_in_cpl, Dust_in_cpl, &
+                      CO2Flux_out_cpl, DMS_out_cpl, chloro_out_cpl,            & 
+                      PCO2a_in_cpl, Dust_in_cpl, &
                       ln_medusa
    USE albedo          !
@@ -145 +146 @@
    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 ::   jps_bio_co2 = 34           ! MEDUSA air-sea CO2 flux in
-   INTEGER, PARAMETER ::   jps_bio_dms = 35           ! MEDUSA DMS surface concentration in
-   INTEGER, PARAMETER ::   jpsnd      = 35            ! total number of fields sent
+   INTEGER, PARAMETER ::   jps_bio_co2 = 34           ! MEDUSA air-sea CO2 flux
+   INTEGER, PARAMETER ::   jps_bio_dms = 35           ! MEDUSA DMS surface concentration
+   INTEGER, PARAMETER ::   jps_bio_chloro = 36        ! MEDUSA chlorophyll surface concentration
+   INTEGER, PARAMETER ::   jpsnd      = 36            ! total number of fields sent
 
    REAL(wp), PARAMETER :: dms_unit_conv = 1.0e+6      ! Coversion factor to get outgong DMS in standard units for coupling
@@ -162 +164 @@
    ! Send to the atmosphere                           !
    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                       
+   TYPE(FLD_C) ::   sn_snd_bio_co2, sn_snd_bio_dms, sn_snd_bio_chloro                   
 
    ! Received from the atmosphere                     !
@@ -249 +251 @@
 
       ! Add MEDUSA related fields to namelist
-      NAMELIST/namsbc_cpl/  sn_snd_bio_co2, sn_snd_bio_dms,                                           &
+      NAMELIST/namsbc_cpl/  sn_snd_bio_co2, sn_snd_bio_dms, sn_snd_bio_chloro,                        &
          &                  sn_rcv_atm_pco2, sn_rcv_atm_dust
 
@@ -307 +309 @@
          WRITE(numout,*)'      bio co2 flux                    = ', TRIM(sn_snd_bio_co2%cldes), ' (', TRIM(sn_snd_bio_co2%clcat), ')'
          WRITE(numout,*)'      bio dms flux                    = ', TRIM(sn_snd_bio_dms%cldes), ' (', TRIM(sn_snd_bio_dms%clcat), ')'
+         WRITE(numout,*)'      bio dms chlorophyll             = ', TRIM(sn_snd_bio_chloro%cldes), ' (', TRIM(sn_snd_bio_chloro%clcat), ')'
          WRITE(numout,*)'      oce co2 flux                    = ', TRIM(sn_snd_co2%cldes   ), ' (', TRIM(sn_snd_co2%clcat   ), ')'
          WRITE(numout,*)'      ice effective conductivity      = ', TRIM(sn_snd_cond%cldes   ), ' (', TRIM(sn_snd_cond%clcat   ), ')'
@@ -833 +836 @@
       IF( TRIM(sn_snd_bio_co2%cldes) == 'medusa' )    ssnd(jps_bio_co2 )%laction = .TRUE.
       
+      ! Surface chlorophyll from Medusa
+      ssnd(jps_bio_chloro)%clname = 'OBioChlo'   
+      IF( TRIM(sn_snd_bio_chloro%cldes) == 'medusa' )    ssnd(jps_bio_chloro )%laction = .TRUE.
+
       !                                                      ! ------------------------- !
       !                                                      ! Sea surface freezing temp !
@@ -1053 +1060 @@
       REAL(wp), POINTER, DIMENSION(:,:) ::   ztx, zty, zmsk, zemp, zqns, zqsr, ztx2, zty2
       !!----------------------------------------------------------------------
-
-      ! RSRH temporary arrays for testing, just to recieve incoming MEDUSA related fields
-      ! until we know where they need to go.
-      REAL(wp), ALLOCATABLE :: atm_pco2(:,:)
-      REAL(wp), ALLOCATABLE :: atm_dust(:,:)
 
       !
@@ -2378 +2380 @@
 
       IF (ln_medusa) THEN
-      !                                                      ! --------------------------------- !
-      !                                                      !  CO2 flux and DMS from MEDUSA     ! 
-      !                                                      ! --------------------------------- !
+      !                                                      ! ---------------------------------------------- !
+      !                                                      !  CO2 flux, DMS and chlorophyll from MEDUSA     ! 
+      !                                                      ! ---------------------------------------------- !
          IF ( ssnd(jps_bio_co2)%laction ) THEN
             CALL cpl_snd( jps_bio_co2, isec, RESHAPE( CO2Flux_out_cpl, (/jpi,jpj,1/) ), info )
@@ -2387 +2389 @@
          IF ( ssnd(jps_bio_dms)%laction )  THEN
             CALL cpl_snd( jps_bio_dms, isec, RESHAPE( DMS_out_cpl, (/jpi,jpj,1/) ), info )
+         ENDIF
+
+         IF ( ssnd(jps_bio_chloro)%laction )  THEN
+            CALL cpl_snd( jps_bio_chloro, isec, RESHAPE( chloro_out_cpl, (/jpi,jpj,1/) ), info )
          ENDIF
       ENDIF

branches/UKMO/dev_r5518_GO6M_dev/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -77 +77 @@
    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 
@@ -138 +140 @@
          ! are enabled
          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) )