Changeset 15015 for NEMO/branches/2021/ticket2680_C1D_PAPA/tests/C1D_ASICS/EXP00/namelist_cfg

Timestamp:

2021-06-17T19:17:25+02:00 (3 years ago)

Author:

gsamson

Message:

merge trunk into branch (#2680)

Location:

NEMO/branches/2021/ticket2680_C1D_PAPA

Files:

• . (modified) (1 prop)
• tests/C1D_ASICS/EXP00/namelist_cfg (modified) (3 diffs)

NEMO/branches/2021/ticket2680_C1D_PAPA

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+

NEMO/branches/2021/ticket2680_C1D_PAPA/tests/C1D_ASICS/EXP00/namelist_cfg

@@ -5 +5 @@
 !! namelists    2 - Surface boundary (namsbc, namsbc_flx, namsbc_blk, namsbc_cpl,
 !!                                    namsbc_sas, namtra_qsr, namsbc_rnf,
-!!                                    namsbc_isf, namsbc_iscpl, namsbc_apr, 
+!!                                    namisf, namsbc_apr, 
 !!                                    namsbc_ssr, namsbc_wave, namberg)
 !!              3 - lateral boundary (namlbc, namagrif, nambdy, nambdy_tide)
@@ -81 +81 @@
 &namc1d        !   1D configuration options                             (ln_c1d =T default: PAPA station)
 !-----------------------------------------------------------------------
-   rn_lat1d    =      30   !  Column latitude
-   rn_lon1d    =      15   !  Column longitude
-   ln_c1d_locpt =  .true.  ! Localization of 1D config in a grid (T) or independant point (F)
+   rn_lat1d    =      30.  !  Column latitude
+   rn_lon1d    =      15.  !  Column longitude
 /
 !-----------------------------------------------------------------------
@@ -118 +117 @@
 !!   namsbc_rnf      river runoffs                                      (ln_rnf     =T)
 !!   namsbc_apr      Atmospheric Pressure                               (ln_apr_dyn =T)
-!!   namsbc_isf      ice shelf melting/freezing                         (ln_isfcav  =T : read (ln_read_cfg=T) or set or usr_def_zgr )
-!!   namsbc_iscpl    coupling option between land ice model and ocean   (ln_isfcav  =T)
 !!   namsbc_wave     external fields from wave model                    (ln_wave    =T)
 !!   namberg         iceberg floats                                     (ln_icebergs=T)
+!!   namsbc_fwb      freshwater-budget adjustment                       (nn_fwb > 0)
 !!======================================================================
 !

@@ -9 +9 @@
 
 # SETTE
-^/utils/CI/sette@14244        sette
+^/utils/CI/sette@HEAD        sette
+