Changeset 2160 for LMDZ5/branches/testing/libf/phylmd/1D_decl_cases.h

Timestamp:

Nov 28, 2014, 4:36:29 PM (10 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes -r2070:2158 into testing branch. Compilation problems introduced by revision r2155 have been corrected by hand

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/1D_decl_cases.h (modified) (5 diffs)

LMDZ5/branches/testing/libf/phylmd/1D_decl_cases.h

@@ +1 @@
+#include "netcdf.inc"
+
 ! Declarations specifiques au cas Toga
         character*80 :: fich_toga
@@ -33 +35 @@
         real u_mod(llm),v_mod(llm), ht_mod(llm),vt_mod(llm)
         real hq_mod(llm),vq_mod(llm),qv_mod(llm),ql_mod(llm),qt_mod(llm)
+        real th_mod(llm)
 
         real ts_cur
@@ -79 +82 @@
 
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!Declarations specifiques au cas AMMA
-        character*80 :: fich_amma
-! Option du cas AMMA ou on impose la discretisation verticale (Ap,Bp)
-        integer nlev_amma, nt_amma
-!       parameter (nlev_amma=29, nt_amma=48)  ! Fleur, juillet 2012
-        parameter (nlev_amma=36, nt_amma=48)  ! Romain, octobre 2012
-!       parameter (nlev_amma=26, nt_amma=48)  ! Test MPL feverier 2013
-        integer year_ini_amma, day_ini_amma, mth_ini_amma
-        real heure_ini_amma
-        real day_ju_ini_amma   ! Julian day of amma first day
-        parameter (year_ini_amma=2006) 
-        parameter (mth_ini_amma=7)
-        parameter (day_ini_amma=10)  ! 10 = 10Juil2006
-        parameter (heure_ini_amma=0.) !0h en secondes
-        real dt_amma
-        parameter (dt_amma=1800.)
-
-!profils initiaux:
-        real plev_amma(nlev_amma)
-        
-        real z_amma(nlev_amma)
-        real th_amma(nlev_amma),q_amma(nlev_amma)
-        real u_amma(nlev_amma)
-        real v_amma(nlev_amma)
-
-        real th_ammai(nlev_amma),q_ammai(nlev_amma)
-        real u_ammai(nlev_amma)
-        real v_ammai(nlev_amma)
-        real vitw_ammai(nlev_amma) 
-        real ht_ammai(nlev_amma)
-        real hq_ammai(nlev_amma)
-        real vt_ammai(nlev_amma)
-        real vq_ammai(nlev_amma)
-        
-!forcings
-        real ht_amma(nlev_amma,nt_amma)
-        real hq_amma(nlev_amma,nt_amma)
-        real vitw_amma(nlev_amma,nt_amma)
-        real lat_amma(nt_amma),sens_amma(nt_amma)
-
-!champs interpoles
-        real vitw_profamma(nlev_amma)
-        real ht_profamma(nlev_amma)
-        real hq_profamma(nlev_amma)
-        real lat_profamma,sens_profamma
-        real vt_profamma(nlev_amma)
-        real vq_profamma(nlev_amma)
-        real th_profamma(nlev_amma)
-        real q_profamma(nlev_amma)
-        real u_profamma(nlev_amma)
-        real v_profamma(nlev_amma)
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
 !Declarations specifiques au cas FIRE
         character*80 :: fich_fire
@@ -143 +93 @@
         parameter (day_ini_fire=14)  ! 14 = 14Juil1987
         parameter (heure_ini_fire=0.) !0h en secondes
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!Declarations specifiques au cas DICE     (MPL 02072013)
+        character*80 :: fich_dice
+        integer nlev_dice, nt_dice
+        parameter (nlev_dice=70, nt_dice=145)  
+        integer year_ini_dice, day_ini_dice, mth_ini_dice
+        real heure_ini_dice
+        real day_ju_ini_dice   ! Julian day of dice first day
+        parameter (year_ini_dice=1999) 
+        parameter (mth_ini_dice=10)
+        parameter (day_ini_dice=23)  ! 23 = 23 october 1999
+        parameter (heure_ini_dice=68400.) !19UTC en secondes
+        real dt_dice
+        parameter (dt_dice=0.5*3600.) ! 1 forcage ttes les demi-heures
+
+!profils initiaux:
+        real plev_dice(nlev_dice)
+        
+        real zz_dice(nlev_dice)
+        real th_dice(nlev_dice),qv_dice(nlev_dice)
+        real u_dice(nlev_dice), v_dice(nlev_dice),o3_dice(nlev_dice)
+        real ht_dice(nlev_dice,nt_dice)
+        real hq_dice(nlev_dice,nt_dice), hu_dice(nlev_dice,nt_dice)
+        real hv_dice(nlev_dice,nt_dice)
+        real w_dice(nlev_dice,nt_dice),omega_dice(nlev_dice,nt_dice)
+        real o3_mod(llm),hu_mod(llm),hv_mod(llm)
+        real th_dicei(nlev_dice),qv_dicei(nlev_dice)
+        real u_dicei(nlev_dice), v_dicei(nlev_dice),o3_dicei(nlev_dice)
+        real ht_dicei(nlev_dice)
+        real hq_dicei(nlev_dice), hu_dicei(nlev_dice)
+        real hv_dicei(nlev_dice)
+        real w_dicei(nlev_dice),omega_dicei(nlev_dice)
+
+        
+!forcings
+        real shf_dice(nt_dice),lhf_dice(nt_dice)
+        real lwup_dice(nt_dice),swup_dice(nt_dice)
+        real tg_dice(nt_dice),ustar_dice(nt_dice),psurf_dice(nt_dice)
+        real ug_dice(nt_dice),vg_dice(nt_dice)
+
+        real shf_prof,lhf_prof,lwup_prof,swup_prof,tg_prof
+        real ustar_prof,psurf_prof,cdrag
+        real ht_profd(nlev_dice),hq_profd(nlev_dice),hu_profd(nlev_dice)
+        real hv_profd(nlev_dice),w_profd(nlev_dice)
+        real omega_profd(nlev_dice),ug_profd,vg_profd
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -216 +212 @@
         real d_t_z(llm), d_q_z(llm)
         real d_t_dyn_z(llm), d_q_dyn_z(llm)
+        real d_u_z(llm),d_v_z(llm)
+        real d_u_dyn(llm),d_v_dyn(llm)
+        real d_u_dyn_z(llm),d_v_dyn_z(llm)
+        real d_u_adv(llm),d_v_adv(llm)
         real zz(llm)
         real zfact