Changeset 15316 for NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate

Timestamp:

2021-10-01T14:13:23+02:00 (3 years ago)

Author:

hadjt

Message:

TRA/trasbc.F90 OCE/trc_oce.F90
Additional files required for tradwl.F90

Location:

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE

Files:

• TRA/trasbc.F90 (modified) (2 diffs)
• trc_oce.F90 (modified) (2 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/TRA/trasbc.F90

@@ -26 +26 @@
    USE traqsr         ! solar radiation penetration
    USE trd_oce        ! trends: ocean variables
-   USE trdtra         ! trends manager: tracers 
+   USE trdtra         ! trends manager: tracers
+   !JT
+   USE tradwl          ! solar radiation penetration (downwell method)
+   !JT
 #if defined key_asminc   
    USE asminc         ! Assimilation increment
@@ -95 +98 @@
       !
 !!gm  This should be moved into sbcmod.F90 module ? (especially now that ln_traqsr is read in namsbc namelist)
-      IF( .NOT.ln_traqsr ) THEN     ! no solar radiation penetration
+      !JT
+      IF( .NOT.ln_traqsr .and. .NOT.ln_tradwl ) THEN     ! no solar radiation penetration
+      !JT
          qns(:,:) = qns(:,:) + qsr(:,:)      ! total heat flux in qns
          qsr(:,:) = 0._wp                     ! qsr set to zero

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/trc_oce.F90

@@ -31 +31 @@
    REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:,:) ::   etot3     !: light absortion coefficient
    REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   oce_co2   !: ocean carbon flux
-
+   ! JT
+   REAL(wp), PUBLIC, SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   rlambda2      !: Lambda2 for downwell version of Short wave Radiation
+   REAL(wp), PUBLIC                                      ::   rlambda       !: Lambda  for downwell version of Short wave Radiation
+   ! JT
 #if defined key_top 
    !!----------------------------------------------------------------------
@@ -54 +57 @@
       !!                  ***  trc_oce_alloc  ***
       !!----------------------------------------------------------------------
+      ! JT
+      INTEGER ::   ierr(1)        ! Local variables
+      !!----------------------------------------------------------------------
+      ierr(:) = 0
+      ! JT
       ALLOCATE( etot3(jpi,jpj,jpk), oce_co2(jpi,jpj), STAT=trc_oce_alloc )
+      ! JT
+      ALLOCATE( rlambda2(jpi,jpj),   STAT=ierr(1) )
+      ! JT
       IF( trc_oce_alloc /= 0 )   CALL ctl_warn('trc_oce_alloc: failed to allocate etot3 array')
+      ! JT
+      IF( trc_oce_alloc /= 0 )   CALL ctl_warn('trc_oce_alloc: failed to allocate etot3, facvol or rlambda2 array')
+      ! JT
+
       !
    END FUNCTION trc_oce_alloc