Changeset 2925 for LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/conf_phys_m.F90

Timestamp:

Jun 30, 2017, 12:17:42 PM (7 years ago)

Author:

fcheruy

Message:

Update tree branch to trunk version

Location:

LMDZ5/branches/LMDZ_tree_FC

Files:

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

LMDZ5/branches/LMDZ_tree_FC/libf/phylmd/conf_phys_m.F90

@@ -173 +173 @@
     REAL,SAVE :: exposant_glace_omp
     REAL,SAVE :: rei_min_omp, rei_max_omp
-    REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_ice_omp
+    INTEGER,SAVE :: iflag_sic_omp
+    REAL,SAVE :: inertie_sol_omp,inertie_sno_omp,inertie_sic_omp
+    REAL,SAVE :: inertie_lic_omp
     REAL,SAVE :: qsol0_omp
     REAL,SAVE :: evap0_omp
@@ -1137 +1139 @@
     !-----------------------------------------------------------------------
     !
-    !Config Key  = inertie_ice
+    !Config Key  = iflag_sic
+    !Config Desc =  
+    !Config Def  = 0
+    !Config Help = 
+    !
+    iflag_sic_omp = 0
+    CALL getin('iflag_sic',iflag_sic_omp)
+    !
+    !Config Key  = inertie_sic
     !Config Desc =  
     !Config Def  = 2000.
     !Config Help = 
     !
-    inertie_ice_omp = 2000.
-    CALL getin('inertie_ice',inertie_ice_omp)
+    inertie_sic_omp = 2000.
+    CALL getin('inertie_sic',inertie_sic_omp)
+    !
+    !Config Key  = inertie_lic
+    !Config Desc =  
+    !Config Def  = 2000.
+    !Config Help = 
+    !
+    inertie_lic_omp = 2000.
+    CALL getin('inertie_lic',inertie_lic_omp)
     !
     !Config Key  = inertie_sno
@@ -2154 +2172 @@
     evap0 = evap0_omp
     albsno0 = albsno0_omp
+    iflag_sic = iflag_sic_omp
     inertie_sol = inertie_sol_omp
-    inertie_ice = inertie_ice_omp
+    inertie_sic = inertie_sic_omp
+    inertie_lic = inertie_lic_omp
     inertie_sno = inertie_sno_omp
     rad_froid = rad_froid_omp
@@ -2572 +2592 @@
     write(lunout,*)' evap0 = ', evap0
     write(lunout,*)' albsno0 = ', albsno0
+    write(lunout,*)' iflag_sic = ', iflag_sic
     write(lunout,*)' inertie_sol = ', inertie_sol
-    write(lunout,*)' inertie_ice = ', inertie_ice
+    write(lunout,*)' inertie_sic = ', inertie_sic
+    write(lunout,*)' inertie_lic = ', inertie_lic
     write(lunout,*)' inertie_sno = ', inertie_sno
     write(lunout,*)' f_cdrag_ter = ',f_cdrag_ter