Changeset 10149 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90

Timestamp:

2018-09-24T11:47:08+02:00 (6 years ago)

Author:

frrh

Message:

Met Office GMED ticket 379: Merged David Ford's MEDUSA assimilation changes
using command:

svn merge -r 10054:10141 ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/UKMO/dev_r5518_GO6_package_asm_3d_bgc_v3

File:

• branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90

@@ -74 +74 @@
                                    jriver_alk, jriver_c,                  &
                                    jriver_n, jriver_si,                   &
+                                   ln_foam_medusa,                        &
                                    riv_alk, riv_c, riv_n, riv_si,         &
                                    zn_dms_chd, zn_dms_chn, zn_dms_din,    &
                                    zn_dms_mld, zn_dms_qsr,                &
+                                   f2_pco2w, f2_fco2w,                    &
                                    xnln, xnld 
       USE trc,               ONLY: med_diag
@@ -87 +89 @@
 #  else
       USE trcco2_medusa,     ONLY: trc_co2_medusa
+      USE mocsy_mainmod,     ONLY: p2fCO2
 #  endif
       USE trcdms_medusa,     ONLY: trc_dms_medusa
@@ -327 +330 @@
                      iters, ' AT (', ji, ', ', jj, ', 1) AT ', kt
                endif
+               IF ( ln_foam_medusa ) THEN
+                  !! DAF (Aug 2017): calculate fCO2 for observation operator
+                  CALL p2fCO2( f_pco2w, ztmp, f_pp0, 0.0, 1, f_fco2w )
+               ENDIF
             ENDIF
          ENDDO
@@ -506 +513 @@
                               CO2flux_conv
                !! ENDIF
+               IF ( ln_foam_medusa ) THEN
+                  !! DAF (Aug 2017): Save pCO2 and fCO2 for observation operator
+                  f2_pco2w(ji,jj) = f_pco2w(ji,jj)
+                  f2_fco2w(ji,jj) = f_pco2w(ji,jj)
+               ENDIF
                IF ( lk_iomput ) THEN
                   IF( med_diag%ATM_PCO2%dgsave ) THEN