Changeset 14032 for NEMO/trunk/src/OCE

Timestamp:

2020-12-03T11:29:29+01:00 (3 years ago)

Author:

rlod

Message:

merging r13541_TOP-01_rlod_Antarctic_ice_Sheet_Fe_Source into trunk@14031

Location:

NEMO/trunk/src/OCE

Files:

• SBC/sbcrnf.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (2 diffs)

NEMO/trunk/src/OCE/SBC/sbcrnf.F90

@@ -42 +42 @@
    REAL(wp)                   ::      rn_dep_max        !: depth over which runoffs is spread       (ln_rnf_depth_ini =T)
    INTEGER                    ::      nn_rnf_depth_file !: create (=1) a runoff depth file or not (=0)
-   LOGICAL                    ::   ln_rnf_icb        !: iceberg flux is specified in a file
+   LOGICAL           , PUBLIC ::   ln_rnf_icb        !: iceberg flux is specified in a file
    LOGICAL                    ::   ln_rnf_tem        !: temperature river runoffs attribute specified in a file
    LOGICAL           , PUBLIC ::   ln_rnf_sal        !: salinity    river runoffs attribute specified in a file

NEMO/trunk/src/OCE/nemogcm.F90

@@ -490 +490 @@
                            CALL dyn_spg_init         ! surface pressure gradient
 
+      !                                      ! Icebergs
+                           CALL icb_init( rn_Dt, nit000)   ! initialise icebergs instance
+
+                                                ! ice shelf
+                           CALL isf_init( Nbb, Nnn, Naa )
 #if defined key_top
       !                                      ! Passive tracers
@@ -495 +500 @@
 #endif
       IF( l_ldfslp     )   CALL ldf_slp_init    ! slope of lateral mixing
-
-      !                                      ! Icebergs
-                           CALL icb_init( rn_Dt, nit000)   ! initialise icebergs instance
-
-                                                ! ice shelf
-                           CALL isf_init( Nbb, Nnn, Naa )
 
       !                                      ! Misc. options