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 13462 for branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 – NEMO

Ignore:
Timestamp:
2020-09-14T16:59:38+02:00 (4 years ago)
Author:
dford
Message:

Tidy up.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/AMM15_v3_6_STABLE_package_collate_utils366_fabmv1/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

    r13453 r13462  
    158158         END DO 
    159159#else 
    160           !IF( lk_asminc ) THEN 
    161           !   IF( ln_bkgwri ) CALL asm_bkg_wri( nit000 - 1 )    ! Output background fields 
    162           !   IF( ln_asmdin ) THEN                        ! Direct initialization 
    163           !      IF( ln_trainc ) CALL tra_asm_inc( nit000 - 1 )    ! Tracers 
    164           !      IF( ln_dyninc ) CALL dyn_asm_inc( nit000 - 1 )    ! Dynamics 
    165           !      IF( ln_sshinc ) CALL ssh_asm_inc( nit000 - 1 )    ! SSH 
    166           !      IF( lk_bgcinc ) CALL bgc_asm_inc( nit000 - 1 )    ! BGC 
    167           !   ENDIF 
    168           !ENDIF 
     160          ! Initial call to assimilation routines moved to stp 
    169161 
    170162#if defined key_agrif 
     
    493485      IF( lk_diaobs     ) THEN                  ! Observation & model comparison 
    494486                            CALL dia_obs_init            ! Initialize observational data 
    495                             !CALL dia_obs( nit000 - 1 )   ! Observation operator for restart 
    496       ENDIF 
    497  
    498       !                                     ! Assimilation increments 
    499 !      IF( lk_asminc ) THEN  
    500 !#if defined key_shelf  
    501 !         CALL  zdf_mxl_tref()     ! Initialization of hmld_tref 
    502 !#endif  
    503 !         CALL asm_inc_init     ! Initialize assimilation increments  
    504 !      ENDIF 
     487                            ! Initial call to dia_obs moved to stp 
     488      ENDIF 
     489 
     490      ! Initialisation of assimilation moved to stp 
    505491 
    506492      IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler 
    507                             !CALL dia_tmb_init  ! TMB outputs 
    508                             !CALL dia_25h_init  ! 25h mean  outputs 
    509                             !CALL dia_diaopfoam_init  ! FOAM operational output 
     493       
     494      ! Initialisation of tmb/25h/diaopfoam outputs moved to stp 
     495       
    510496      ! 
    511497   END SUBROUTINE nemo_init 
Note: See TracChangeset for help on using the changeset viewer.