Changeset 9939 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ICB

Timestamp:

2018-07-13T09:28:50+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branche phased with MLF@9937 branche

Location:

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3

Files:

• . (copied) (copied from NEMO/trunk)
• src/OCE/ICB/icbini.F90 (modified) (1 diff)
• src/OCE/ICB/icbtrj.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ICB/icbini.F90

@@ -58 +58 @@
       !!              - setup either test icebergs or calving file
       !!----------------------------------------------------------------------
-      REAL(wp), INTENT(in) ::   pdt   ! iceberg time-step (rdt*nn_fsbc)
+      REAL(wp), INTENT(in) ::   pdt   ! iceberg time-step (rn_Dt*nn_fsbc)
       INTEGER , INTENT(in) ::   kt    ! time step number
       !

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/ICB/icbtrj.F90

@@ -69 +69 @@
       !!----------------------------------------------------------------------
 
+!!gm we could probably use the daymod calculation here....
+!!               ===>>> TO BE checked by someone
+
       ! compute initial time step date
       CALL ju2ymds( fjulday, iyear, imonth, iday, zsec )
@@ -74 +77 @@
 
       ! compute end time step date
-      zfjulday = fjulday + rdt / rday * REAL( nitend - nit000 + 1 , wp)
+      zfjulday = fjulday + rn_Dt / rday * REAL( nitend - nit000 + 1 , wp)
       IF( ABS(zfjulday - REAL(NINT(zfjulday),wp)) < 0.1 / rday )   zfjulday = REAL(NINT(zfjulday),wp)   ! avoid truncation error
       CALL ju2ymds( zfjulday, iyear, imonth, iday, zsec )