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 15273 – NEMO

Changeset 15273


Ignore:
Timestamp:
2021-09-20T14:08:08+02:00 (15 months ago)
Author:
jroberts
Message:

Test to try and resolve conflicts on fcm make merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_obs_oper_strthr/NEMOGCM/NEMO/OPA_SRC/DOM/daymod.F90

    r15272 r15273  
    357357               ihour = INT(ksecs/3600) 
    358358               iminute = ksecs/60-ihour*60 
    359  
    360359               ! Add to nn_time0 
    361360               nhour   =   nn_time0 / 100 
    362361               nminute = ( nn_time0 - nhour * 100 ) 
    363362               nminute=nminute+iminute 
    364  
    365363               IF( nminute >= 60 ) THEN 
    366364                  nminute=nminute-60 
     
    375373               adatrj = INT(adatrj)                    ! adatrj set to integer as nn_time0 updated 
    376374            ELSE 
    377                ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day) 
     375               ! Conflict 1,JRJ. parameters corresponding to nit000 - 1 (as we start the step loop with a call to day) 
     376               ! Why won't this work 
    378377               ndastp = ndate0        ! ndate0 read in the namelist in dom_nam 
    379378               nhour   =   nn_time0 / 100 
     
    384383            ENDIF 
    385384         ELSE 
    386             ! parameters corresponding to nit000 - 1 (as we start the step loop with a call to day) 
     385            ! Conflict 2, JRJ. parameters corresponding to nit000 - 1 (as we start the step loop with a call to day) 
     386            ! This code needs to exist 
    387387            ndastp = ndate0           ! ndate0 read in the namelist in dom_nam 
    388388            nhour   =   nn_time0 / 100 
Note: See TracChangeset for help on using the changeset viewer.