Changeset 10047 for branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90

Timestamp:

2018-08-08T17:12:35+02:00 (6 years ago)

Author:

jpalmier

Message:

merge with GO6_package_branch 9385-10020 ; plus debug OMIP_DIC

File:

• branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/OPA_SRC/TRA/trabbc.F90

@@ -134 +134 @@
       INTEGER  ::   ierror              ! local integer
       !
-      TYPE(FLD_N)        ::   sn_qgh    ! informations about the geotherm. field to be read
-      CHARACTER(len=256) ::   cn_dir    ! Root directory for location of ssr files
+      TYPE(FLD_N), DIMENSION (1)  ::   slf_q     ! array of namelist informations on the fields to read
+      TYPE(FLD_N)                 ::   sn_qgh    ! informations about the geotherm. field to be read
+      CHARACTER(len=256)          ::   cn_dir    ! Root directory for location of ssr files
       !
       NAMELIST/nambbc/ln_trabbc, nn_geoflx, rn_geoflx_cst, sn_qgh, cn_dir 
@@ -173 +174 @@
             IF(lwp) WRITE(numout,*) '      *** variable geothermal heat flux'
             !
+            slf_q(1) = sn_qgh
+            !
             ALLOCATE( sf_qgh(1), STAT=ierror )
             IF( ierror > 0 ) THEN
@@ -179 +182 @@
             ENDIF
             ALLOCATE( sf_qgh(1)%fnow(jpi,jpj,1)   )
-            IF( sn_qgh%ln_tint )ALLOCATE( sf_qgh(1)%fdta(jpi,jpj,1,2) )
+            IF( slf_q(1)%ln_tint )   ALLOCATE( sf_qgh(1)%fdta(jpi,jpj,1,2) )
             ! fill sf_chl with sn_chl and control print
-            CALL fld_fill( sf_qgh, (/ sn_qgh /), cn_dir, 'tra_bbc_init',   &
+            CALL fld_fill( sf_qgh, slf_q, cn_dir, 'tra_bbc_init',   &
                &          'bottom temperature boundary condition', 'nambbc' )