Changeset 1913 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

Apr 4, 2018, 8:04:13 AM (7 years ago)

Author:

emillour

Message:

Mars GCM:

• Forgotten in previous commit: gwprofil.F -> gwprofil_mod.F (here also the

size of an argument, rho, was incorrect in caller orodrag).

• Turned newsedim.F into a module newsedim_mod.F
• Adapted co2cloud.F and improvedCO2clouds.F to not use "newunit" to open file

(it is perfectly legitimate F2008 Fortran, but older compiler such as gfortran
on local LMD machines are not there yet).
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• callsedim.F (modified) (3 diffs)
• co2cloud.F (modified) (3 diffs)
• gwprofil_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/gwprofil.F) (2 diffs)
• improvedCO2clouds.F (modified) (2 diffs)
• newsedim_mod.F (moved) (moved from trunk/LMDZ.MARS/libf/phymars/newsedim.F) (2 diffs)
• orodrag_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/libf/phymars/callsedim.F

@@ -13 +13 @@
      &                      igcm_ccnco2_mass, igcm_ccnco2_number,
      &                      igcm_co2_ice
-      USE comcstfi_h
+      USE newsedim_mod, ONLY: newsedim
+      USE comcstfi_h, ONLY: g
       IMPLICIT NONE
 
@@ -37 +38 @@
 c   -------------
       
-#include "callkeys.h"
+      include "callkeys.h"
 
 c
@@ -371 +372 @@
           
                call newsedim(ngrid,nlay,1,1,ptimestep,
-     &         pplev,masse,epaisseur,zt,rd(ir),rho_dust,qr(1,1,ir),
+     &         pplev,masse,epaisseur,zt,rd(ir),(/rho_dust/),qr(1,1,ir),
      &         wq,0.5)
 

trunk/LMDZ.MARS/libf/phymars/co2cloud.F

@@ -18 +18 @@
      &     rho_dust, nuiceco2_sed, nuiceco2_ref,
      &     rho_ice_co2,r3n_q,rho_ice,nuice_sed
-     
+      USE newsedim_mod, ONLY: newsedim
       IMPLICIT NONE
 
@@ -156 +156 @@
       double precision :: Qtemp
       double precision :: ltemp1(10000),ltemp2(10000)
-      integer :: nelem,lebon1,lebon2,uQext
+      integer :: nelem,lebon1,lebon2
+      integer,parameter :: uQext=555
       DOUBLE PRECISION n_aer(nbinco2_cld),Rn,No,n_derf,dev2
       DOUBLE PRECISION Qext1bins2(ngrid,nlay)   
@@ -254 +255 @@
            STOP
         endif
-        open(newunit=uQext,file=trim(datafile)//
+!        open(newunit=uQext,file=trim(datafile)//
+        open(unit=uQext,file=trim(datafile)//
      &       '/optprop_co2ice_1mic.dat'
      &       ,FORM='formatted')

trunk/LMDZ.MARS/libf/phymars/gwprofil_mod.F

@@ +1 @@
+      MODULE gwprofil_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE GWPROFIL
      *         ( klon, klev
@@ -211 +217 @@
  531  CONTINUE        
 
-      RETURN
-      END
+      END SUBROUTINE GWPROFIL
+
+      END MODULE gwprofil_mod

trunk/LMDZ.MARS/libf/phymars/improvedCO2clouds.F

@@ -167 +167 @@
       integer nelem,lebon1,lebon2
       double precision :: ltemp1(130),ltemp2(130)
-      integer ibin,uMeteor,j
+      integer ibin,j
+      integer,parameter :: uMeteor=666
 
       IF (firstcall) THEN
@@ -254 +255 @@
            endif
 !used Variables
-           open(newunit=uMeteor,file=trim(datafile)//
+!           open(newunit=uMeteor,file=trim(datafile)//
+           open(unit=uMeteor,file=trim(datafile)//
      &          '/Meteo_flux_Plane.dat'
      &          ,FORM='formatted')

trunk/LMDZ.MARS/libf/phymars/newsedim_mod.F

@@ +1 @@
+      MODULE newsedim_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+
       SUBROUTINE newsedim(ngrid,nlay,naersize,nrhosize,ptimestep,
      &  pplev,masse,epaisseur,pt,rd,rho,pqi,wq,beta)
-      USE comcstfi_h
+      USE comcstfi_h, ONLY: r,g
       IMPLICIT NONE
 
@@ -209 +215 @@
 
 
-      RETURN
-      END
-
+      END SUBROUTINE newsedim
+      
+      END MODULE newsedim_mod
+

trunk/LMDZ.MARS/libf/phymars/orodrag_mod.F

@@ -78 +78 @@
       use dimradmars_mod, only: ndlo2
       USE gwstress_mod, ONLY: gwstress
+      USE gwprofil_mod, ONLY: gwprofil
       USE comcstfi_h, ONLY: g, cpp
       implicit none
@@ -123 +124 @@
       integer ji,jk,jl,klevm1,ilevp1
 C      real gkwake
-      real ztmst,pvar(NDLO2,4),ztauf,zrtmst,zdelp,zb,zc,zbet
+      real ztmst,pvar(NDLO2,4),ztauf(NDLO2,klev+1)
+      real zrtmst,zdelp,zb,zc,zbet
       real zconb,zabsv,zzd1,ratio,zust,zvst,zdis,ztemp
 C