Changeset 8024 for branches/UKMO

Timestamp:

2017-05-12T13:09:55+02:00 (7 years ago)

Author:

frrh

Message:

Add all missing coupling fields to reference namelist, delete redundant
test arrays and add temporary initialisation of chlorophyll field for
test purposes.

Location:

branches/UKMO/dev_r5518_couple_chlorophyll/NEMOGCM

Files:

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

branches/UKMO/dev_r5518_couple_chlorophyll/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_couple_chlorophyll/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -1050 +1050 @@
       REAL(wp), POINTER, DIMENSION(:,:) ::   ztx, zty, zmsk, zemp, zqns, zqsr
       !!----------------------------------------------------------------------
-
-      ! 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(:,:)
 
       !
@@ -2360 +2355 @@
 
          IF ( ssnd(jps_bio_chloro)%laction )  THEN
+! RSRH Temporary code to allow testing with UM until MEDUSA is able to populate
+! things with real values at which point we remove everything in this IF statement
+! apart from the cpl_snd call.  
+write(numout,*) "RSRH set up chloro"
+flush(numout)
+
+             chloro_out_cpl(:,:) = 0.00000627
+write(numout,*) "RSRH send chloro"
+flush(numout)
+
             CALL cpl_snd( jps_bio_chloro, isec, RESHAPE( chloro_out_cpl, (/jpi,jpj,1/) ), info )
+write(numout,*) "RSRH completed send chloro"
+flush(numout)
          ENDIF
       ENDIF