Changeset 2058

Timestamp:

Jan 9, 2019, 1:01:19 PM (6 years ago)

Author:

jleconte

Message:

on our way to compile mesoscale+generic with gfortran

Location:

trunk

Files:

• LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F (modified) (2 diffs)
• LMDZ.GENERIC/libf/phystd/physiq_mod.F90 (modified) (4 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_generic_lmd_new/update_inputs_physiq_mod.F (modified) (1 diff)
• MESOSCALE/LMD_MM_MARS/makemeso (modified) (5 diffs)

trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

@@ -848 +848 @@
 ! Initialize chemical species
 ! -----------------
+#ifndef MESOSCALE
       if(tracer.and.photochem) then
            call initracer(1,nq,tname)
@@ -856 +857 @@
            noms(1:nq)=nametmp(1:nq)
       endif ! tracer and photochem
+#endif
 
 

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -57 +57 @@
       use comm_wrf, only : comm_HR_SW, comm_HR_LW, &
                            comm_CLOUDFRAC,comm_TOTCLOUDFRAC,&
+                           comm_SURFRAIN,comm_REEVAP,comm_HR_DYN,&
                            comm_RAIN,comm_SNOW,comm_ALBEQ,&
                            comm_FLUXTOP_DN,comm_FLUXABS_SW,&
@@ -777 +778 @@
       ! Compute mean mass, cp, and R
       ! --------------------------------
-
+#ifndef MESOSCALE
       if(photochem) then
          call concentrations(ngrid,nlayer,nq,pplay,pt,pdt,pq,pdq,ptimestep)
       endif 
+#endif
 
 !---------------------------------
@@ -1350 +1352 @@
   ! -------------------------
 
+#ifndef MESOSCALE
          IF (photochem) then
 
@@ -1385 +1388 @@
 
          END IF  ! of IF (photochem)
-
+#endif
 
 

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_generic_lmd_new/update_inputs_physiq_mod.F

@@ -316 +316 @@
             M_ALBEDO,CST_AL,&
             M_TSURF,M_EMISS,M_CO2ICE,&
-            M_GW,M_Z0,CST_Z0&
+            M_GW,M_Z0,CST_Z0,&
             M_H2OICE,&
             phisfi_val)

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -19 +19 @@
 ###############################
 
-
+###path to compiled version of ioipsl on your system for generic physics
+pathioipsl='/home/leconte/script/ioipsl/modipsl/lib'
 
 ##############################################################################################
@@ -417 +418 @@
                        echo 15 | configure > log_compile 2> log_error
                        sed -f physics.sed configure.wrf > yeah ; mv -f yeah configure.wrf  
-                       sed s+"-L../$phys/libo -llmd"+"-L../$phys/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah ; mv -f yeah configure.wrf ;;
+                       sed s+"-L../$phys/libo -llmd"+"-lnetcdf -lnetcdff -L../$phys/libo -llmd $NETCDF/lib/libnetcdf.a -lnetcdf"+g configure.wrf > yeah ; mv -f yeah configure.wrf ;;
                      # PGF90, 32 bits, no nesting
      pgf_32_single)    echo 1 | configure > log_compile 2> log_error 
@@ -752 +753 @@
     elif [[ "${phys}" == *"generic"* ]]
     then
-      nohup ./makelmdz -t ${tra} -p std -b 36x32 -s 1 -d 25 rcm1d -arch X64_MESU -cpp MESOSCALE | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys #Proxb
+      nohup ./makelmdz -t 1 -p std -b 38x36 -full -s 1 -d 25 rcm1d -arch mascaret_gfortran_para -cpp MESOSCALE | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys #Proxb
+      nohup ./makelmdz -t 1 -p std -b 38x36 -s 1 -d 25 rcm1d -arch mascaret_gfortran_para -cpp MESOSCALE | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys #Proxb
     fi
   fi
@@ -769 +771 @@
     cp -f LINUX*/*.a temp
   else #VENUS and GENERIC 
-    cp -f linux*/*.a temp/ # on /u/ and /planeto/
+#    cp -f linux*/*.a temp/ # on /u/ and /planeto/
+    cp -f */*.a temp/ # on /u/ and /planeto/
     #cp -f /home/mlefevre/modipsl/lib/libioipsl.a temp/ #on CICLAD
     #cp -f X64*/*.a temp #on MESU and OCCIGEN
-    cp -f ../ioipsl/libioipsl.a temp/
+    cp -f $pathioipsl/libioipsl.a temp/
   fi
   cd temp
@@ -808 +811 @@
       mv  *.mod ../inc/
     else
-      mv  ./libo/linux*/*.mod ../inc/ # on /u/ and /planeto/
+#      mv  ./libo/linux*/*.mod ../inc/ # on /u/ and /planeto/
+      mv  ./libo/*/*.mod ../inc/ # on /u/ and /planeto/
       #mv  ./libo/CICLAD*/*.mod ../inc/ # on CICLAD
       #mv  ./libo/X64*/*.mod ../inc/ # on MESU and OCCIGEN
-      cp -f ./ioipsl/*.mod ../inc/
+      cp -f $pathioipsl/*.mod ../inc/
     fi
   fi