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 11822 for NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD – NEMO

Ignore:
Timestamp:
2019-10-29T11:41:36+01:00 (5 years ago)
Author:
acc
Message:

Branch 2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps. Sette tested updates to branch to align with trunk changes between 10721 and 11740. Sette tests are passing but results differ from branch before these changes (except for GYRE_PISCES and VORTEX) and branch results already differed from trunk because of algorithmic fixes. Will need more checks to confirm correctness.

Location:
NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD/trdini.F90

    r10946 r11822  
    4949      REWIND( numnam_ref )              ! Namelist namtrd in reference namelist : trends diagnostic 
    5050      READ  ( numnam_ref, namtrd, IOSTAT = ios, ERR = 901 ) 
    51 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrd in reference namelist', lwp ) 
     51901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrd in reference namelist' ) 
    5252      ! 
    5353      REWIND( numnam_cfg )              ! Namelist namtrd in configuration namelist : trends diagnostic 
    5454      READ  ( numnam_cfg, namtrd, IOSTAT = ios, ERR = 902 ) 
    55 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrd in configuration namelist', lwp ) 
     55902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrd in configuration namelist' ) 
    5656      IF(lwm) WRITE( numond, namtrd ) 
    5757      ! 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD/trdmxl.F90

    r10946 r11822  
    735735      REWIND( numnam_ref )              ! Namelist namtrd_mxl in reference namelist : mixed layer trends diagnostic 
    736736      READ  ( numnam_ref, namtrd_mxl, IOSTAT = ios, ERR = 901 ) 
    737 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrd_mxl in reference namelist', lwp ) 
     737901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namtrd_mxl in reference namelist' ) 
    738738 
    739739      REWIND( numnam_cfg )              ! Namelist namtrd_mxl in configuration namelist : mixed layer trends diagnostic 
    740740      READ  ( numnam_cfg, namtrd_mxl, IOSTAT = ios, ERR = 902 ) 
    741 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrd_mxl in configuration namelist', lwp ) 
     741902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namtrd_mxl in configuration namelist' ) 
    742742      IF(lwm) WRITE( numond, namtrd_mxl ) 
    743743      ! 
    … …  
    765765 
    766766      IF( MOD( nitend, nn_trd ) /= 0 ) THEN 
    767          WRITE(numout,cform_err) 
    768          WRITE(numout,*) '                Your nitend parameter, nitend = ', nitend 
    769          WRITE(numout,*) '                is no multiple of the trends diagnostics frequency        ' 
    770          WRITE(numout,*) '                          you defined, nn_trd   = ', nn_trd 
    771          WRITE(numout,*) '                This will not allow you to restart from this simulation.  ' 
    772          WRITE(numout,*) '                You should reconsider this choice.                        '  
    773          WRITE(numout,*)  
    774          WRITE(numout,*) '                N.B. the nitend parameter is also constrained to be a     ' 
    775          WRITE(numout,*) '                     multiple of the nn_fsbc parameter ' 
    776          CALL ctl_stop( 'trd_mxl_init: see comment just above' ) 
     767         WRITE(ctmp1,*) '                Your nitend parameter, nitend = ', nitend 
     768         WRITE(ctmp2,*) '                is no multiple of the trends diagnostics frequency        ' 
     769         WRITE(ctmp3,*) '                          you defined, nn_trd   = ', nn_trd 
     770         WRITE(ctmp4,*) '                This will not allow you to restart from this simulation.  ' 
     771         WRITE(ctmp5,*) '                You should reconsider this choice.                        '  
     772         WRITE(ctmp6,*)  
     773         WRITE(ctmp7,*) '                N.B. the nitend parameter is also constrained to be a     ' 
     774         WRITE(ctmp8,*) '                     multiple of the nn_fsbc parameter ' 
     775         CALL ctl_stop( ctmp1, ctmp2, ctmp3, ctmp4, ctmp5, ctmp6, ctmp7, ctmp8 ) 
    777776      END IF 
    778777 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD/trdmxl_rst.F90

    r10425 r11822  
    4747      !!-------------------------------------------------------------------------------- 
    4848 
     49      IF( .NOT. ln_rst_list .AND. nn_stock == -1 )   RETURN   ! we will never do any restart 
     50 
    4951      ! to get better performances with NetCDF format: 
    5052      ! we open and define the ocean restart_mxl file one time step before writing the data (-> at nitrst - 1) 
    5153      ! except if we write ocean restart_mxl files every time step or if an ocean restart_mxl file was writen at nitend - 1 
    52       IF( kt == nitrst - 1 .OR. nstock == 1 .OR. ( kt == nitend .AND. MOD( nitend - 1, nstock ) == 0 ) ) THEN 
     54      IF( kt == nitrst - 1 .OR. nn_stock == 1 .OR. ( kt == nitend .AND. MOD( nitend - 1, nn_stock ) == 0 ) ) THEN 
    5355         ! beware of the format used to write kt (default is i8.8, that should be large enough...) 
    5456         IF( nitrst > 999999999 ) THEN   ;   WRITE(clkt, *       ) nitrst 

  • NEMO/branches/2019/dev_r10721_KERNEL-02_Storkey_Coward_IMMERSE_first_steps/src/OCE/TRD/trdvor.F90

    r11480 r11822  
    4646   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avr      ! average 
    4747   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrb     ! before vorticity (kt-1) 
    48    REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrbb    ! vorticity at begining of the nwrite-1 timestep averaging period 
     48   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrbb    ! vorticity at begining of the nn_write-1 timestep averaging period 
    4949   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrbn    ! after vorticity at time step after the 
    50    REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   rotot        ! begining of the NWRITE-1 timesteps 
     50   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   rotot        ! begining of the NN_WRITE-1 timesteps 
    5151   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrtot   ! 
    5252   REAL(wp), SAVE, ALLOCATABLE, DIMENSION(:,:)   ::   vor_avrres   ! 
    … …  
    130130      !!              from ocean surface down to control surface (NetCDF output) 
    131131      !! 
    132       !! ** Method/usage :   integration done over nwrite-1 time steps 
     132      !! ** Method/usage :   integration done over nn_write-1 time steps 
    133133      !! 
    134134      !! ** Action :   trends : 
    … …  
    144144      !!                  vortrd (,,10) = forcing term 
    145145      !!                  vortrd (,,11) = bottom friction term 
    146       !!                  rotot(,) : total cumulative trends over nwrite-1 time steps 
     146      !!                  rotot(,) : total cumulative trends over nn_write-1 time steps 
    147147      !!                  vor_avrtot(,) : first membre of vrticity equation 
    148148      !!                  vor_avrres(,) : residual = dh/dt entrainment 
    … …  
    216216      !!              from ocean surface down to control surface (NetCDF output) 
    217217      !! 
    218       !! ** Method/usage :   integration done over nwrite-1 time steps 
     218      !! ** Method/usage :   integration done over nn_write-1 time steps 
    219219      !! 
    220220      !! ** Action :     trends : 
    … …  
    230230      !!                  vortrd (,,10) = forcing term 
    231231      !!      vortrd (,,11) = bottom friction term 
    232       !!                  rotot(,) : total cumulative trends over nwrite-1 time steps 
     232      !!                  rotot(,) : total cumulative trends over nn_write-1 time steps 
    233233      !!                  vor_avrtot(,) : first membre of vrticity equation 
    234234      !!                  vor_avrres(,) : residual = dh/dt entrainment 
    … …  
    364364      ENDIF 
    365365 
    366       ! II.2 cumulated trends over analysis period (kt=2 to nwrite) 
     366      ! II.2 cumulated trends over analysis period (kt=2 to nn_write) 
    367367      ! ---------------------- 
    368       ! trends cumulated over nwrite-2 time steps 
     368      ! trends cumulated over nn_write-2 time steps 
    369369 
    370370      IF( kt >= nit000+2 ) THEN 
    … …  
    380380      !   III. Output in netCDF + residual computation 
    381381      !  ============================================= 
    382  
     382       
    383383      ! define time axis 
    384384      it    = kt 
    … …  
    508508      ENDIF 
    509509#if defined key_diainstant 
    510       zsto = nwrite*rdt 
     510      zsto = nn_write*rdt 
    511511      clop = "inst("//TRIM(clop)//")" 
    512512#else 
Note: See TracChangeset for help on using the changeset viewer.