Changeset 4722 for LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

Oct 9, 2023, 5:33:07 PM (12 months ago)

Author:

Laurent Fairhead

Message:

Modification by O. Torres to the cdrag routines to include different bulk formulae
to calculate cdrag coefficients over ocean as well as an iteration of that
calculation.
The iteration is controlled by flag ok_cdrag_iter which if set to FALSE by default
to converge with previous results.
The choice of bulk formulae is set with the choix_bulk parameter
The number of iterations to run is set with nit_bulk
OT, PB, CD, LF

Location:

LMDZ6/trunk

Files:

• . (modified) (1 prop)
• libf/phylmd/conf_phys_m.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -243 +243 @@
     LOGICAL, SAVE :: ok_new_lscp_omp
     LOGICAL, SAVE :: ok_icefra_lscp_omp
+    !rajout de choix_bulk et nit_bulk par Olivier Torres
+    INTEGER,SAVE  :: choix_bulk_omp
+    INTEGER,SAVE  :: nit_bulk_omp
+    INTEGER,SAVE  :: kz0_omp
     LOGICAL, SAVE :: ok_bs_omp, ok_rad_bs_omp
 
@@ -936 +940 @@
     nbapp_rad_omp = 12
     CALL getin('nbapp_rad',nbapp_rad_omp)
+
+    !rajout Olivier Torres
+    !Config  Key  = choix_bulk
+    !Config  Desc = choix de la formulation bulk a prendre dans clcdrag au-dessus de l'ocean
+    !Config  Def  = 0
+    !Config         0 -> originale (lmdz/Louis 79)
+    !Config         1 -> COARE
+    !Config         2 -> CORE-"pure" (cf. Large)
+    !Config         3 -> CORE-"mixte" (avec z_0 et C_T^N donnees par Smith 88)
+    choix_bulk_omp = 0
+    CALL getin('choix_bulk',choix_bulk_omp)
+
+    !Config  Key  = nit_bulk
+    !Config  Desc = choix du nombre d'it de pt fixe dans la bulk
+    !Config  Def  = 5
+    nit_bulk_omp = 1
+    CALL getin('nit_bulk',nit_bulk_omp)
+
+    !Config  Key  = kz0
+    !Config  Desc = choix de la formulation z0 pour la bulk ECUME
+    !Config  Def  = 1
+    !Config         0 -> ARPEGE formulation
+    !Config         1 -> Smith Formulation
+    !Config         2 -> Direct computation using the stability functions
+    kz0_omp = 0
+    CALL getin('kz0',kz0_omp)
+
 
     !Config  Key  = iflag_con
@@ -2496 +2527 @@
     var_fco2_land_cor = var_fco2_land_cor_omp
     dms_cycle_cpl = dms_cycle_cpl_omp
+    !rajout Olivier Torres
+    kz0=kz0_omp
+    choix_bulk = choix_bulk_omp
+    nit_bulk = nit_bulk_omp
 
     ! Test of coherence between type_ocean and version_ocean
@@ -2847 +2882 @@
     WRITE(lunout,*) ' buf_sph_pol = ', buf_sph_pol
     WRITE(lunout,*) ' buf_siz_pol= ', buf_siz_pol
+    !rajout Olivier Torres
+    write(lunout,*) 'choix_bulk = ', choix_bulk
+    write(lunout,*) 'nit_bulk = ', nit_bulk
+    write(lunout,*) 'kz0 = ', kz0
 
     !$OMP END MASTER