Changeset 13311 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/sbccpl.F90

Timestamp:

2020-07-16T15:27:24+02:00 (4 years ago)

Author:

frrh

Message:

Save dev changes for concurrent LFRIC + GO8 running

File:

• NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/sbccpl.F90 (modified) (3 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/sbccpl.F90

@@ -466 +466 @@
       !                                                      ! ------------------------- !
       srcv(jpr_rnf   )%clname = 'O_Runoff'
-      IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN
-         srcv(jpr_rnf)%laction = .TRUE.
-         l_rnfcpl              = .TRUE.                      ! -> no need to read runoffs in sbcrnf
-         ln_rnf                = nn_components /= jp_iam_sas ! -> force to go through sbcrnf if not sas
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '   runoffs received from oasis -> force ln_rnf = ', ln_rnf
-      ENDIF
+      IF (ln_cpl) THEN ! Don't perform this code if coupling is not active!
+         IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN
+            srcv(jpr_rnf)%laction = .TRUE.
+            l_rnfcpl              = .TRUE.                      ! -> no need to read runoffs in sbcrnf
+            ln_rnf                = nn_components /= jp_iam_sas ! -> force to go through sbcrnf if not sas
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) '   runoffs received from oasis -> force ln_rnf = ', ln_rnf
+         ENDIF
+      ENDIF 
       !
       srcv(jpr_cal)%clname = 'OCalving'   ;  IF( TRIM( sn_rcv_cal%cldes) == 'coupled' )   srcv(jpr_cal)%laction = .TRUE.
@@ -543 +545 @@
       !                                                      ! ------------------------- !
       srcv(jpr_co2 )%clname = 'O_AtmCO2'   
-      IF( TRIM(sn_rcv_co2%cldes   ) == 'coupled' )  THEN
-         srcv(jpr_co2 )%laction = .TRUE.
-         l_co2cpl = .TRUE.
-         IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) '   Atmospheric pco2 received from oasis '
-         IF(lwp) WRITE(numout,*)
+      IF (ln_cpl) THEN ! Not needed if we're not coupling
+         IF( TRIM(sn_rcv_co2%cldes   ) == 'coupled' )  THEN
+            srcv(jpr_co2 )%laction = .TRUE.
+            l_co2cpl = .TRUE.
+            IF(lwp) WRITE(numout,*)
+            IF(lwp) WRITE(numout,*) '   Atmospheric pco2 received from oasis '
+            IF(lwp) WRITE(numout,*)
+         ENDIF
       ENDIF
       !
@@ -1032 +1036 @@
       ! ================================ !
 
-      CALL cpl_define(jprcv, jpsnd, nn_cplmodel)
+      ! If ln_cpl is false, clearly we don't want to call cpl_dfine!
+      if (ln_cpl) CALL cpl_define(jprcv, jpsnd, nn_cplmodel)
       
       IF (ln_usecplmask) THEN