Changeset 9374 for branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90

Timestamp:

2018-03-06T13:35:36+01:00 (5 years ago)

Author:

jpalmier

Message:

JPALM -- 06-03-2018 -- corrections after review suggestions ; see GMED 380 - comment 22

File:

• branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_GO6_CO2_cmip/NEMOGCM/NEMO/TOP_SRC/MEDUSA/air_sea.F90

@@ -67 +67 @@
 # endif
       USE in_out_manager,    ONLY: lwp, numout
-      USE oce,               ONLY: PCO2a_in_cpl
       USE par_kind,          ONLY: wp
       USE par_oce,           ONLY: jpi, jpim1, jpj, jpjm1
-      USE sbc_oce,           ONLY: fr_i, lk_oasis, qsr, wndm
+      USE sbc_oce,           ONLY: fr_i, qsr, wndm
       USE sms_medusa,        ONLY: jdms, jdms_input, jdms_model,          &
                                    jriver_alk, jriver_c,                  &
@@ -152 +151 @@
             !! OPEN wet point IF..THEN loop
             IF (tmask(ji,jj,1) == 1) then
-               IF (lk_oasis) THEN
-                  !!! Jpalm test on atm xCO2
-                  IF ( (f_xco2a(ji,jj) .GT. 10000.0 ).OR.(f_xco2a(ji,jj) .LE. 0.0 ) ) THEN
-                    IF(lwp) THEN 
-                       WRITE(numout,*) ' atm xCO2 = ',f_xco2a(ji,jj),          &
-                                       ' -- ji =', mig(ji),' jj = ', mjg(jj)
-                    ENDIF
-                    CALL ctl_stop( 'MEDUSA - Air-Sea :', 'unrealistic coupled atm xCO2 ' )
-                 ENDIF 
-               ENDIF
                !!
                !! AXY (23/06/15): as part of an effort to update the 
@@ -264 +253 @@
                !!       Enormous dpco2 - even if all carb chem caract are OK.
                !!       and this check stops the model.
-               !!       ==> let's run the model without it and see how it goes.
+               !!       --Input checks are already more than enough to stop the
+               !!       model if carb chem goes crazy. 
+               !!       we remove the mocsy output checks
                !!===================
                !!IF ( (f_pco2w(ji,jj) > 1.E4 ).OR.(f_pco2w(ji,jj) < 0.0 ) .OR.     &