Changeset 3006

Timestamp:

Jul 21, 2023, 11:47:04 AM (16 months ago)

Author:

emillour

Message:

Mars PCM:
More code cleanup. Turn "nirdata.h" common into module "nirdata.F90" and
include "nir_leedat.F" (reading/loading of the data) in the module.
Also turn nirco2abs.F in a module.
EM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• libf/phymars/nir_leedat.F (deleted)
• libf/phymars/nirco2abs.F (modified) (6 diffs)
• libf/phymars/nirdata.F90 (moved) (moved from trunk/LMDZ.MARS/libf/phymars/nirdata.h) (1 diff)
• libf/phymars/physiq_mod.F (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -4111 +4111 @@
 specifically output for Grads in 1D).
 Also turned lwi and lwflux into modules while at it.
+
+== 21/07/2023 == EM
+More code cleanup. Turn "nirdata.h" common into module "nirdata.F90" and
+include "nir_leedat.F" (reading/loading of the data) in the module.
+Also turn nirco2abs.F in a module.

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

@@ +1 @@
+      MODULE nirco2abs_mod
+      
+      IMPLICIT NONE
+      
+      CONTAINS
+      
       SUBROUTINE nirco2abs(ngrid,nlayer,pplay,dist_sol,nq,pq,
      $     mu0,fract,declin,pdtnirco2)
@@ -6 +12 @@
        USE comcstfi_h, ONLY: pi
        USE time_phylmdz_mod, ONLY: daysec
+       use nirdata_mod, only: npres, alfa, corgcm, oco21d, pres1d
        IMPLICIT NONE
 c=======================================================================
@@ -49 +56 @@
 c
       include "callkeys.h"
-      include "nirdata.h"
 
 c-----------------------------------------------------------------------
@@ -237 +243 @@
       END IF
 
-      end 
+      END SUBROUTINE nirco2abs
 
 
@@ -247 +253 @@
 C escout(nlayer) on pressure grid p(nlayer).
 C
-      real escout(nlayer),p(nlayer)
-      real escin(nl),pin(nl),wm,wp
-      integer nl,nlayer,n1,n,nm,np
+      real,intent(out) :: escout(nlayer)
+      real,intent(in) :: p(nlayer)
+      integer,intent(in) :: nlayer
+      real,intent(in) :: escin(nl)
+      real,intent(in) :: pin(nl)
+      integer,intent(in) :: nl
+      
+      real :: wm,wp
+      integer :: n1,n,nm,np
+      
       do n1=1,nlayer
          if(p(n1) .gt. 1500. .or. p(n1) .lt. 1.0e-13) then
@@ -265 +278 @@
          endif
       enddo
-      end
+      
+      end subroutine interpnir
+
+      END MODULE nirco2abs_mod

trunk/LMDZ.MARS/libf/phymars/nirdata.F90

@@ +1 @@
+module nirdata_mod
 
-      integer npres                ! Number of pressures in NIR correction
-      parameter (npres=42)         ! table
+implicit none
 
-      common /NIRdata/ pres1d,corgcm,oco21d,alfa,p1999
-!$OMP THREADPRIVATE(/NIRdata/)
-      real    pres1d(npres)
-      real    corgcm(npres)
-      real    oco21d(npres),alfa(npres),p1999(npres)
+! Number of pressures in NIR correction table
+integer,parameter :: npres=42   
+
+real,save,protected :: pres1d(npres)
+real,save,protected :: corgcm(npres)
+real,save,protected :: oco21d(npres)
+real,save,protected :: alfa(npres)
+real,save,protected :: p1999(npres)
+!$OMP THREADPRIVATE(pres1d,corgcm,oco21d,alfa,p1999)
+
+contains
+
+  subroutine NIR_leedat 
+
+!       reads parameters for NIR NLTE calculation    
+
+!       nov 2011    fgg+malv    first version                
+!***********************************************************************
+
+    use datafile_mod, only: datadir
+    USE mod_phys_lmdz_para, ONLY: is_master
+    USE mod_phys_lmdz_transfert_para, ONLY: bcast
+
+    implicit none
+
+! local variables                               
+
+    integer :: ind
+
+    if (is_master) then
+      open(43,file=trim(datadir)//'/NIRcorrection_feb2011.dat', &
+             status='old')
+      do ind=1,9
+        read(43,*)
+      enddo
+      
+      do ind=1,npres
+         read(43,*)pres1d(ind),corgcm(ind),oco21d(ind),p1999(ind), &
+              alfa(ind)
+         !Tabulated pression to Pa
+         pres1d(ind)=pres1d(ind)*100.
+      enddo
+      close(43)
+
+    endif !  if(is_master) then
+
+    call bcast(pres1d)
+    call bcast(corgcm)
+    call bcast(oco21d)
+    call bcast(p1999)
+    call bcast(alfa)
+
+  end subroutine NIR_leedat 
+
+end module nirdata_mod

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

@@ -56 +56 @@
       use comsaison_h, only: dist_sol, declin, zls, 
      &                       mu0, fract, local_time
+      use nirdata_mod, only: NIR_leedat
+      use nirco2abs_mod, only: nirco2abs
       use slope_mod, only: theta_sl, psi_sl
       use conc_mod, only: rnew, cpnew, mmean
@@ -109 +111 @@
      &                        major_slope,compute_meshgridavg,
      &                        ini_comslope_h
-      USE ioipsl_getincom, only: getin
       use write_output_mod, only: write_output
       IMPLICIT NONE