Changeset 467

Timestamp:

07/12/16 20:09:13 (8 years ago)

Author:

dubos

Message:

Merged with HEAT branch - testing required for : etat0_database, disvert_strato

Location:

codes/icosagcm/trunk/src

Files:

• disvert.f90 (modified) (2 diffs)
• disvert_strato.f90 (added)
• etat0.f90 (modified) (4 diffs)
• etat0_database.f90 (added)
• icosagcm.f90 (modified) (1 diff)
• q_sat.f90 (added)
• vertical_remap.f90 (added)

codes/icosagcm/trunk/src/disvert.f90

@@ -23 +23 @@
   SUBROUTINE init_disvert
   USE disvert_std_mod, ONLY: ap_std=>ap, bp_std=>bp, presnivs_std=>presnivs, init_disvert_std=>init_disvert
+  USE disvert_strato_mod, ONLY: ap_strato=>ap, bp_strato=>bp, presnivs_strato=>presnivs, init_disvert_strato=>init_disvert
   USE disvert_apbp_mod, ONLY: ap_apbp=>ap, bp_apbp=>bp, presnivs_apbp=>presnivs, init_disvert_apbp=>init_disvert
   USE disvert_ncar_mod, ONLY: ap_ncar=>ap, bp_ncar=>bp, presnivs_ncar=>presnivs, init_disvert_ncar=>init_disvert
@@ -65 +66 @@
         presnivs=>presnivs_std
       
+      CASE('strato')
+        
+        CALL init_disvert_strato
+        ap=>ap_strato
+        bp=>bp_strato
+        presnivs=>presnivs_strato
+
       CASE('read_apbp')
     

codes/icosagcm/trunk/src/etat0.f90

@@ -9 +9 @@
     REAL(rstd) :: etat0_temp
 
-    PUBLIC :: etat0, etat0_type
+    PUBLIC :: etat0, init_etat0, etat0_type
 
 CONTAINS
   
+  SUBROUTINE init_etat0
+  USE etat0_database_mod
+  IMPLICIT NONE
+
+    CALL getin("etat0",etat0_type)
+
+    SELECT CASE (TRIM(etat0_type))
+      CASE ('isothermal')
+      CASE ('temperature_profile')
+      CASE ('jablonowsky06')
+      CASE ('dcmip5')
+      CASE ('williamson91.6')
+      CASE ('start_file')
+      CASE ('database')
+        CALL init_etat0_database
+      CASE ('academic')
+      CASE ('held_suarez')
+      CASE ('venus')
+      CASE ('dcmip1')
+      CASE ('dcmip2_mountain','dcmip2_schaer_noshear','dcmip2_schaer_shear')
+      CASE ('dcmip3')
+      CASE ('dcmip4')
+      CASE DEFAULT
+         PRINT*, 'Bad selector for variable etat0 <',etat0_type, &
+            '> options are <jablonowsky06>, <academic>, <dcmip[1-4]> '
+         STOP
+    END SELECT
+
+  END SUBROUTINE init_etat0
+
   SUBROUTINE etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_geopot,f_w, f_q)
     USE mpipara, ONLY : is_mpi_root
@@ -28 +58 @@
     USE etat0_dcmip2016_supercell_mod, ONLY : getin_etat0_dcmip2016_supercell=>getin_etat0
     ! Ad hoc interfaces
-    USE etat0_academic_mod, ONLY : etat0_academic=>etat0  
-    USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0  
-    USE etat0_venus_mod,  ONLY : etat0_venus=>etat0  
+    USE etat0_academic_mod, ONLY : etat0_academic=>etat0
+    USE etat0_heldsz_mod, ONLY : etat0_heldsz=>etat0
+    USE etat0_venus_mod,  ONLY : etat0_venus=>etat0
+    USE etat0_database_mod, ONLY : etat0_database=>etat0
     USE etat0_start_file_mod, ONLY : etat0_start_file=>etat0  
 
@@ -93 +124 @@
     !------------------- Ad hoc interfaces --------------------
     SELECT CASE (TRIM(etat0_type))
+     CASE ('database')
+        CALL etat0_database(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
     CASE ('start_file')
        CALL etat0_start_file(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
@@ -109 +142 @@
          PRINT*, 'Bad selector for variable etat0 <',etat0_type, &
               '> options are <isothermal>, <temperature_profile>, <held_suarez>, &
-              &<bubble>, <venus>, <jablonowsky06>, <academic>, <dcmip[1-4]> '
+              &<bubble>, <venus>, <jablonowsky06>, <start_file>, <database>, <academic>, <dcmip[1-4]> '
          STOP
       END IF

codes/icosagcm/trunk/src/icosagcm.f90

@@ -31 +31 @@
     CALL compute_domain
     CALL init_transfert
+    CALL init_etat0
     CALL init_writefield
     CALL init_trace