Changeset 14248

Timestamp:

2020-12-23T14:55:53+01:00 (3 years ago)

Author:

dancopsey

Message:

Resolved conflicts and fixed compile errors.

File:

• NEMO/branches/UKMO/NEMO_4.0.3_penetrating_solar/src/OCE/SBC/sbccpl.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.3_penetrating_solar/src/OCE/SBC/sbccpl.F90

@@ -120 +120 @@
    INTEGER, PARAMETER ::   jpr_tauwy  = 56   ! y component of the ocean stress from waves
    INTEGER, PARAMETER ::   jpr_ts_ice = 57   ! Sea ice surface temp
+   INTEGER, PARAMETER ::   jpr_grnm   = 58   ! Greenland ice mass 
+   INTEGER, PARAMETER ::   jpr_antm   = 59   ! Antarctic ice mass 
+   INTEGER, PARAMETER ::   jpr_rnf_1d = 60   ! 1D river runoff 
    INTEGER, PARAMETER ::   jpr_qtr    = 61   ! Transmitted solar
 
@@ -2148 +2151 @@
          !      ! ===> here we receive the qtr_ice_top array from the coupler
          CASE ('coupled')
-            IF (ln_scale_ice_fluxes) THEN
+            IF (ln_scale_ice_flux) THEN
                WHERE( a_i(:,:,:) > 0.0_wp ) zqtr_ice_top(:,:,:) = frcv(jpr_qtr)%z3(:,:,:) * a_i_last_couple(:,:,:) / a_i(:,:,:)
                WHERE( a_i(:,:,:) <= 0.0_wp ) zqtr_ice_top(:,:,:) = 0.0_wp