Skip to content

Commit

Permalink
Merge branch 'user/nikizadehgfdl/force_not_to_initialize_a_gtracer' of
Browse files Browse the repository at this point in the history
…https://github.com/nikizadehgfdl/MOM6 into nikizadehgfdl-user/nikizadehgfdl/force_not_to_initialize_a_gtracer
  • Loading branch information
adcroft committed May 5, 2018
2 parents 026907e + 5f4e030 commit f8ffe35
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/tracer/MOM_generic_tracer.F90
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,10 @@ subroutine initialize_MOM_generic_tracer(restart, day, G, GV, h, param_file, dia
endif
enddo; enddo ; enddo
endif

elseif(.not. g_tracer%requires_restart) then
!Do nothing for this tracer, it is initialized by the tracer package
call MOM_error(NOTE,"initialize_MOM_generic_tracer: "//&
"skip initialization of generic tracer "//trim(g_tracer_name))
else !Do it old way if the tracer is not registered to start from a specific source file.
!This path should be deprecated if all generic tracers are required to start from specified sources.
if (len_trim(CS%IC_file) > 0) then
Expand All @@ -335,7 +338,8 @@ subroutine initialize_MOM_generic_tracer(restart, day, G, GV, h, param_file, dia
endif
else
call MOM_error(FATAL,"initialize_MOM_generic_tracer: "//&
"check Generic Tracer IC filename "//trim(CS%IC_file)//".")
"check Generic Tracer IC filename "//trim(CS%IC_file)//&
" for tracer "//trim(g_tracer_name))
endif

endif
Expand Down

0 comments on commit f8ffe35

Please sign in to comment.