Changeset 10047 for branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90

Timestamp:

2018-08-08T17:12:35+02:00 (6 years ago)

Author:

jpalmier

Message:

merge with GO6_package_branch 9385-10020 ; plus debug OMIP_DIC

File:

• branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/TOP_SRC/MEDUSA/bio_medusa_diag_slice.F90

@@ -36 +36 @@
       USE dom_oce,           ONLY: tmask
       USE in_out_manager,    ONLY: lwp, numout
-# if defined key_iomput
       USE iom,               ONLY: iom_put
-# endif
       USE lbclnk,            ONLY: lbc_lnk
       USE oce,               ONLY: CO2Flux_out_cpl, DMS_out_cpl
@@ -245 +243 @@
       !!----------------------------------------------------------------------
          IF( med_diag%PI_ATM_PCO2%dgsave ) THEN
-            CALL iom_put( "PI_ATM_PCO2"  , f_pi_pco2a2d )
-            DEALLOCATE( f_pi_pco2a2d )
+            CALL iom_put( "PI_ATM_PCO2"  , f_pi_pco2a_2d )
+            DEALLOCATE( f_pi_pco2a_2d )
          ENDIF
          IF( med_diag%PI_OCN_PH%dgsave ) THEN
-            CALL iom_put( "PI_OCN_PH"  , f_pi_ph2d )
-            DEALLOCATE( f_pi_ph2d )
+            CALL iom_put( "PI_OCN_PH"  , f_pi_ph_2d )
+            DEALLOCATE( f_pi_ph_2d )
          ENDIF
          IF( med_diag%PI_OCN_PCO2%dgsave ) THEN
-            CALL iom_put( "PI_OCN_PCO2"  , f_pi_pco2w2d )
-            DEALLOCATE( f_pi_pco2w2d )
+            CALL iom_put( "PI_OCN_PCO2"  , f_pi_pco2w_2d )
+            DEALLOCATE( f_pi_pco2w_2d )
          ENDIF
          IF( med_diag%PI_OCNH2CO3%dgsave ) THEN
-            CALL iom_put( "PI_OCNH2CO3"  , f_pi_h2co32d )
-            DEALLOCATE( f_pi_h2co32d )
+            CALL iom_put( "PI_OCNH2CO3"  , f_pi_h2co3_2d )
+            DEALLOCATE( f_pi_h2co3_2d )
          ENDIF
          IF( med_diag%PI_OCN_HCO3%dgsave ) THEN
-            CALL iom_put( "PI_OCN_HCO3"  , f_pi_hco32d )
-            DEALLOCATE( f_pi_hco32d )
+            CALL iom_put( "PI_OCN_HCO3"  , f_pi_hco3_2d )
+            DEALLOCATE( f_pi_hco3_2d )
          ENDIF
          IF( med_diag%PI_OCN_CO3%dgsave ) THEN
-            CALL iom_put( "PI_OCN_CO3"  , f_pi_co32d )
-            DEALLOCATE( f_pi_co32d )
+            CALL iom_put( "PI_OCN_CO3"  , f_pi_co3_2d )
+            DEALLOCATE( f_pi_co3_2d )
          ENDIF
          IF( med_diag%PI_CO2FLUX%dgsave ) THEN
-            CALL iom_put( "PI_CO2FLUX"  , f_pi_co2flux2d )
-            DEALLOCATE( f_pi_co2flux2d )
+            CALL iom_put( "PI_CO2FLUX"  , f_pi_co2flux_2d )
+            DEALLOCATE( f_pi_co2flux_2d )
          ENDIF
          IF( med_diag%PI_FGCO2%dgsave ) THEN
@@ -277 +275 @@
          ENDIF
          IF( med_diag%PI_OM_CAL%dgsave ) THEN
-            CALL iom_put( "PI_OM_CAL"  , f_pi_omcal )
-            !! AXY: WHY IS THIS NOT DEALLOCATED?
+            CALL iom_put( "PI_OM_CAL"  , f_pi_omcal_2d )
+       DEALLOCATE( f_pi_omcal_2d )
          ENDIF
          IF( med_diag%PI_OM_ARG%dgsave ) THEN
-            CALL iom_put( "PI_OM_ARG"  , f_pi_omarg )
-            !! AXY: WHY IS THIS NOT DEALLOCATED?
+            CALL iom_put( "PI_OM_ARG"  , f_pi_omarg_2d )
+       DEALLOCATE( f_pi_omarg_2d )
          ENDIF
          IF( med_diag%PI_TCO2%dgsave ) THEN
-            CALL iom_put( "PI_TCO2"  , f_pi_TDIC2d )
-            DEALLOCATE( f_pi_TDIC2d )
+            CALL iom_put( "PI_TCO2"  , f_pi_TDIC_2d )
+            DEALLOCATE( f_pi_TDIC_2d )
          ENDIF
          IF( med_diag%PI_ATM_XCO2%dgsave ) THEN
-            CALL iom_put( "PI_ATM_XCO2"  ,   f_pi_xco2a_2d      )
+            CALL iom_put( "PI_ATM_XCO2"  ,   f_pi_xco2a_2d )
             DEALLOCATE( f_pi_xco2a_2d )
          ENDIF
          IF( med_diag%PI_OCN_FCO2%dgsave ) THEN
-            CALL iom_put( "PI_OCN_FCO2"  ,   f_pi_fco2w_2d      )
+            CALL iom_put( "PI_OCN_FCO2"  ,   f_pi_fco2w_2d )
             DEALLOCATE( f_pi_fco2w_2d )
          ENDIF
          IF( med_diag%PI_ATM_FCO2%dgsave ) THEN
-            CALL iom_put( "PI_ATM_FCO2"  ,   f_pi_fco2a_2d      )
+            CALL iom_put( "PI_ATM_FCO2"  ,   f_pi_fco2a_2d )
             DEALLOCATE( f_pi_fco2a_2d )
          ENDIF