Changeset 15273

Timestamp:

2021-09-20T14:08:08+02:00 (3 years ago)

Author:

jroberts

Message:

Test to try and resolve conflicts on fcm make merge

File:

• branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

@@ -357 +357 @@
                ihour = INT(ksecs/3600)
                iminute = ksecs/60-ihour*60
-
                ! Add to nn_time0
                nhour   =   nn_time0 / 100
                nminute = ( nn_time0 - nhour * 100 )
                nminute=nminute+iminute
-
                IF( nminute >= 60 ) THEN
                   nminute=nminute-60
@@ -375 +373 @@
                adatrj = INT(adatrj)                    ! adatrj set to integer as nn_time0 updated
             ELSE
-               ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
+               ! Conflict 1,JRJ. parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
+               ! Why won't this work
                ndastp = ndate0        ! ndate0 read in the namelist in dom_nam
                nhour   =   nn_time0 / 100
@@ -384 +383 @@
             ENDIF
          ELSE
-            ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
+            ! Conflict 2, JRJ. parameters corresponding to nit000 - 1 (as we start the step loop with a call to day)
+            ! This code needs to exist
             ndastp = ndate0           ! ndate0 read in the namelist in dom_nam
             nhour   =   nn_time0 / 100