New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10922 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF – NEMO

Ignore:
Timestamp:
2019-05-02T17:10:39+02:00 (5 years ago)
Author:
acc
Message:

2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps : Convert IOM, LDF, OBS and SBC directories and compatibility changes elsewhere that these changes enforce. Changes pass SETTE and compare with original trunk results. Outstanding issues (currently with work-arounds) in DIU/step_diu.F90 and fld_bdy_interp within SBC/fldread.F90; proper soltions pending

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF/dtadyn.F90

    r10921 r10922  
    122122      CALL fld_read( kt, 1, sf_dyn )      !=  read data at kt time step   ==! 
    123123      ! 
    124       IF( l_ldfslp .AND. .NOT.lk_c1d )   CALL  dta_dyn_slp( kt )    ! Computation of slopes 
     124      IF( l_ldfslp .AND. .NOT.lk_c1d )   CALL  dta_dyn_slp( kt, Kbb, Kmm )    ! Computation of slopes 
    125125      ! 
    126126      ts(:,:,:,jp_tem,Kmm) = sf_dyn(jf_tem)%fnow(:,:,:)  * tmask(:,:,:)    ! temperature 
    … …  
    679679 
    680680 
    681    SUBROUTINE dta_dyn_slp( kt ) 
     681   SUBROUTINE dta_dyn_slp( kt, Kbb, Kmm ) 
    682682      !!--------------------------------------------------------------------- 
    683683      !!                    ***  ROUTINE dta_dyn_slp  *** 
    … …  
    687687      !!--------------------------------------------------------------------- 
    688688      INTEGER,  INTENT(in) :: kt       ! time step 
     689      INTEGER,  INTENT(in) :: Kbb, Kmm ! ocean time level indices 
    689690      ! 
    690691      INTEGER  ::   ji, jj     ! dummy loop indices 
    … …  
    702703            zts(:,:,:,jp_sal) = sf_dyn(jf_sal)%fdta(:,:,:,1) * tmask(:,:,:)   ! salinity  
    703704            avt(:,:,:)        = sf_dyn(jf_avt)%fdta(:,:,:,1) * tmask(:,:,:)   ! vertical diffusive coef. 
    704             CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj ) 
     705            CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm ) 
    705706            uslpdta (:,:,:,1) = zuslp (:,:,:)  
    706707            vslpdta (:,:,:,1) = zvslp (:,:,:)  
    … …  
    711712            zts(:,:,:,jp_sal) = sf_dyn(jf_sal)%fdta(:,:,:,2) * tmask(:,:,:)   ! salinity  
    712713            avt(:,:,:)        = sf_dyn(jf_avt)%fdta(:,:,:,2) * tmask(:,:,:)   ! vertical diffusive coef. 
    713             CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj ) 
     714            CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm ) 
    714715            uslpdta (:,:,:,2) = zuslp (:,:,:)  
    715716            vslpdta (:,:,:,2) = zvslp (:,:,:)  
    … …  
    730731              zts(:,:,:,jp_sal) = sf_dyn(jf_sal)%fdta(:,:,:,2) * tmask(:,:,:)   ! salinity  
    731732              avt(:,:,:)        = sf_dyn(jf_avt)%fdta(:,:,:,2) * tmask(:,:,:)   ! vertical diffusive coef. 
    732               CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj ) 
     733              CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm ) 
    733734              ! 
    734735              uslpdta (:,:,:,2) = zuslp (:,:,:)  
    … …  
    754755         zts(:,:,:,jp_sal) = sf_dyn(jf_sal)%fnow(:,:,:) * tmask(:,:,:)   ! salinity  
    755756         avt(:,:,:)        = sf_dyn(jf_avt)%fnow(:,:,:) * tmask(:,:,:)   ! vertical diffusive coef. 
    756          CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj ) 
     757         CALL compute_slopes( kt, zts, zuslp, zvslp, zwslpi, zwslpj, Kbb, Kmm ) 
    757758         ! 
    758759         IF( l_ldfslp .AND. .NOT.lk_c1d ) THEN    ! Computes slopes (here avt is used as workspace) 
    … …  
    767768 
    768769 
    769    SUBROUTINE compute_slopes( kt, pts, puslp, pvslp, pwslpi, pwslpj ) 
     770   SUBROUTINE compute_slopes( kt, pts, puslp, pvslp, pwslpi, pwslpj, Kbb, Kmm ) 
    770771      !!--------------------------------------------------------------------- 
    771772      !!                    ***  ROUTINE dta_dyn_slp  *** 
    … …  
    779780      REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(out) :: pwslpi   ! zonal diapycnal slopes 
    780781      REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(out) :: pwslpj   ! meridional diapycnal slopes 
     782      INTEGER ,                              INTENT(in ) :: Kbb, Kmm ! ocean time level indices 
    781783      !!--------------------------------------------------------------------- 
    782784      ! 
    … …  
    796798         rn2b(:,:,:) = rn2(:,:,:)         ! need for zdfmxl 
    797799         CALL zdf_mxl( kt )            ! mixed layer depth 
    798          CALL ldf_slp( kt, rhd, rn2 )  ! slopes 
     800         CALL ldf_slp( kt, rhd, rn2, Kbb, Kmm )  ! slopes 
    799801         puslp (:,:,:) = uslp (:,:,:) 
    800802         pvslp (:,:,:) = vslp (:,:,:) 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OFF/nemogcm.F90

    r10921 r10922  
    317317                           CALL  istate_init    ! ocean initial state (Dynamics and tracers) 
    318318 
    319                            CALL     sbc_init    ! Forcings : surface module 
     319                           CALL     sbc_init( Nbb, Nnn )    ! Forcings : surface module 
    320320 
    321321      !                                      ! Tracer physics 
Note: See TracChangeset for help on using the changeset viewer.